ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues 7 Pull Requests Releases Wiki Activity
33,200 Commits 2 Branches 0 Tags 54 MiB
f0bb18115c
Commit Graph

33200 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Wink Saville
f6426844fc Merge "DataConnection : Have a separate alarm for each APN type." into honeycomb-LTE 2011-05-26 18:19:08 -07:00
Wink Saville
2fe14ec0a9 Merge "Derive ICC status from multiple application status for UICC" into honeycomb-LTE 2011-05-26 18:18:52 -07:00
Dianne Hackborn
3b2b4ec36a am 8fcbfb52: am 94250ac6: Merge "Add new supports-screens attributes for declaring the compatible screens." into honeycomb-mr2 
* commit '8fcbfb52607263754b6d3895a112f792c5c3a12e':
  Add new supports-screens attributes for declaring the compatible screens.
 2011-05-26 17:12:36 -07:00
Dianne Hackborn
e9807fb75d am 94250ac6: Merge "Add new supports-screens attributes for declaring the compatible screens." into honeycomb-mr2 
* commit '94250ac69c6e07534e4781d3479dccb79d8c366c':
  Add new supports-screens attributes for declaring the compatible screens.
 2011-05-26 17:09:39 -07:00
Dianne Hackborn
7c379dd6de Merge "Add new supports-screens attributes for declaring the compatible screens." into honeycomb-mr2 2011-05-26 17:07:52 -07:00
Romain Guy
7efd2c2b95 am a33bb164: am 4686fb8a: Merge "DO NOT MERGE Correctly implement the CLEAR xfermode." into honeycomb-mr2 
* commit 'a33bb164b2ac792d5bba76ba198fb052197fd520':
  DO NOT MERGE Correctly implement the CLEAR xfermode.
 2011-05-26 17:00:14 -07:00
Romain Guy
fd92426389 am 4686fb8a: Merge "DO NOT MERGE Correctly implement the CLEAR xfermode." into honeycomb-mr2 
* commit '4686fb8ac8c88eb1f0d76fc4157be4cb5949e98e':
  DO NOT MERGE Correctly implement the CLEAR xfermode.
 2011-05-26 16:57:18 -07:00
Romain Guy
b3b2b965cc Merge "DO NOT MERGE Correctly implement the CLEAR xfermode." into honeycomb-mr2 2011-05-26 16:55:33 -07:00
Gilles Debunne
bae889c132 am 4ce6822b: am 24de44a1: Merge "ExternalStorageFormatter takes an optional StorageVolume target." into honeycomb-mr2 
* commit '4ce6822bc63665ca3e9d9984766f367ce4f4d3a7':
  ExternalStorageFormatter takes an optional StorageVolume target.
 2011-05-26 15:50:13 -07:00
Gilles Debunne
ed04dd1f0c am 24de44a1: Merge "ExternalStorageFormatter takes an optional StorageVolume target." into honeycomb-mr2 
* commit '24de44a1877be3e5d63697f90c98a87a4d88b1fb':
  ExternalStorageFormatter takes an optional StorageVolume target.
 2011-05-26 15:47:14 -07:00
Gilles Debunne
ca24675bf9 Merge "ExternalStorageFormatter takes an optional StorageVolume target." into honeycomb-mr2 2011-05-26 15:44:18 -07:00
Scott Main
4575111abc am f18348b1: am a2272130: cherry pick Change-Id: Ia5ac228612569684a4ffc79ab3914442c15edfe2 docs: fix typo and slight revision 
* commit 'f18348b1225926435ddfa505192a7462208be0ca':
  cherry pick Change-Id: Ia5ac228612569684a4ffc79ab3914442c15edfe2 docs: fix typo and slight revision
 2011-05-26 15:31:13 -07:00
Scott Main
3c5e383bcb am 70f45917: am f5d8ceae: cherry pick Change-Id: I58ae8210a17f76ff92ee9d064cf42fd4a81ad9b5 docs: fix markup and typos 
* commit '70f4591762a0ca0fca71ebfe156a8916b0a9475c':
  cherry pick Change-Id: I58ae8210a17f76ff92ee9d064cf42fd4a81ad9b5 docs: fix markup and typos
 2011-05-26 15:31:10 -07:00
Scott Main
2fe6863df3 am b7cfc618: am 28fb09e0: cherry pick Change-Id: I183ff47e59617b2c17a92b876ca8c8bcc9b45262 docs: add document for the compatibility library 
* commit 'b7cfc6181be090cc93d304a96e035f5a754085ae':
  cherry pick Change-Id: I183ff47e59617b2c17a92b876ca8c8bcc9b45262 docs: add document for the compatibility library
 2011-05-26 15:31:07 -07:00
Scott Main
ff694d9e8c am a2272130: cherry pick Change-Id: Ia5ac228612569684a4ffc79ab3914442c15edfe2 docs: fix typo and slight revision 
* commit 'a22721301181fb995559d5badd9d286803a0ec86':
  cherry pick Change-Id: Ia5ac228612569684a4ffc79ab3914442c15edfe2 docs: fix typo and slight revision
 2011-05-26 15:26:28 -07:00
Scott Main
2f0ababc1c am f5d8ceae: cherry pick Change-Id: I58ae8210a17f76ff92ee9d064cf42fd4a81ad9b5 docs: fix markup and typos 
* commit 'f5d8ceae68993e3af9905e58c8c6bdf90872880c':
  cherry pick Change-Id: I58ae8210a17f76ff92ee9d064cf42fd4a81ad9b5 docs: fix markup and typos
 2011-05-26 15:23:49 -07:00
Scott Main
0f7af9ca11 am 28fb09e0: cherry pick Change-Id: I183ff47e59617b2c17a92b876ca8c8bcc9b45262 docs: add document for the compatibility library 
* commit '28fb09e0b27a97e4664c9a31a3c72a067794b4c6':
  cherry pick Change-Id: I183ff47e59617b2c17a92b876ca8c8bcc9b45262 docs: add document for the compatibility library
 2011-05-26 15:21:34 -07:00
Adam Powell
b5f372d3af am 47dae694: am 7eba403e: Merge "DO NOT MERGE - Fix bug 4489946 - Remove placeholder views for phones in smaller-screen decor layouts." into honeycomb-mr2 
* commit '47dae694d7476e8a3de1e9b487b89e003b8440b1':
  DO NOT MERGE - Fix bug 4489946 - Remove placeholder views for phones in smaller-screen decor layouts.
 2011-05-26 14:14:50 -07:00
Kenny Root
98f3ba4d0e am 5e34a194: am 1d8f8819: Merge "Break apart queries to getInstalled* API DO NOT MERGE" into honeycomb-mr2 
* commit '5e34a1945a6b26dff5551a37627c5216b076d896':
  Break apart queries to getInstalled* API DO NOT MERGE
 2011-05-26 14:14:48 -07:00
Scott Main
94f3ba13f4 am 101139cc: am c3123961: DO NOT MERGE cherry pick Change-Id: I67ef29f8ccc7b4a754ebb24efd96e9821e3d8662 docs: add accepted values for setting status bar visibility 
* commit '101139cc8f5b975dfacf1a2ffd3bdae8e3907f65':
  DO NOT MERGE cherry pick Change-Id: I67ef29f8ccc7b4a754ebb24efd96e9821e3d8662 docs: add accepted values for setting status bar visibility
 2011-05-26 14:14:45 -07:00
Dianne Hackborn
1953c54732 am 0821f274: am 2a108403: I am a dummy. 
* commit '0821f2745d05af98195c9c1c7889ca14e9c56e0b':
  I am a dummy.
 2011-05-26 14:14:41 -07:00
Dianne Hackborn
81b95108a8 am d5238cc1: am 7a09f72b: Merge "Rework how we decide whether to use system or status bar." into honeycomb-mr2 
* commit 'd5238cc1ab8366389b2aada228f2f2e5cbb3244e':
  Rework how we decide whether to use system or status bar.
 2011-05-26 14:14:35 -07:00
Eric Fischer
31d0f4b7d9 am 90856661: am 66fd9ab2: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr2 
* commit '90856661cf07453a23c3737f421a4686b70d95c1':
  Import revised translations.  DO NOT MERGE
 2011-05-26 14:14:31 -07:00
Adam Powell
463df4f97f am 7eba403e: Merge "DO NOT MERGE - Fix bug 4489946 - Remove placeholder views for phones in smaller-screen decor layouts." into honeycomb-mr2 
* commit '7eba403e9a64f7153b7e5788902d4f799739158e':
  DO NOT MERGE - Fix bug 4489946 - Remove placeholder views for phones in smaller-screen decor layouts.
 2011-05-26 13:34:45 -07:00
Kenny Root
6f2a934b7a am 1d8f8819: Merge "Break apart queries to getInstalled* API DO NOT MERGE" into honeycomb-mr2 
* commit '1d8f8819f1e98cdf3b7756396158613e95fe9eb6':
  Break apart queries to getInstalled* API DO NOT MERGE
 2011-05-26 13:34:42 -07:00
Scott Main
4aec722792 am c3123961: DO NOT MERGE cherry pick Change-Id: I67ef29f8ccc7b4a754ebb24efd96e9821e3d8662 docs: add accepted values for setting status bar visibility 
* commit 'c31239616cca417e71acb98813df7eda645835df':
  DO NOT MERGE cherry pick Change-Id: I67ef29f8ccc7b4a754ebb24efd96e9821e3d8662 docs: add accepted values for setting status bar visibility
 2011-05-26 13:34:40 -07:00
Dianne Hackborn
994df53cfc am 2a108403: I am a dummy. 
* commit '2a108403803bd30bee1c019060c208fb8c52c10c':
  I am a dummy.
 2011-05-26 13:34:37 -07:00
Dianne Hackborn
5e4fc48da2 am 7a09f72b: Merge "Rework how we decide whether to use system or status bar." into honeycomb-mr2 
* commit '7a09f72b8850ec22e4ca7fd50aba20ead7666f67':
  Rework how we decide whether to use system or status bar.
 2011-05-26 13:34:33 -07:00
Eric Fischer
94145ad43d am 66fd9ab2: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr2 
* commit '66fd9ab236b3df85a32792caec41a2cd83622e28':
  Import revised translations.  DO NOT MERGE
 2011-05-26 13:34:29 -07:00
Adam Powell
0921b4be2b Merge "DO NOT MERGE - Fix bug 4489946 - Remove placeholder views for phones in smaller-screen decor layouts." into honeycomb-mr2 2011-05-26 13:26:33 -07:00
Kenny Root
e7bf0322d2 Merge "Break apart queries to getInstalled* API DO NOT MERGE" into honeycomb-mr2 2011-05-26 13:10:23 -07:00
Simon Wilson
e3e4c09d92 resolved conflicts for merge of a38fad37 to honeycomb-plus-aosp 
Conflicts:
	telephony/java/com/android/internal/telephony/cdma/SmsMessage.java

Change-Id: I4c808c752954c5d1f752f4b4c02ad41ea491e416
 2011-05-26 12:53:15 -07:00
Dianne Hackborn
2992337f5a Merge "Rework how we decide whether to use system or status bar." into honeycomb-mr2 2011-05-26 11:39:22 -07:00
Eric Fischer
423eb5e44c Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr2 2011-05-26 11:36:58 -07:00
Wink Saville
2150dd3750 am f55e0346: Merge "Remove or disable some verbose debugging." into honeycomb-LTE 
* commit 'f55e0346a5a40714be8a7e1571ff65e6ef1a9949':
  Remove or disable some verbose debugging.
 2011-05-26 11:07:18 -07:00
Dianne Hackborn
74ab5dd5c3 am 80ef2a97: am 42f8094c: Merge "Spiffy new compatibility mode UI." into honeycomb-mr2 
* commit '80ef2a9745e6103efd9698577536bbfed1fd74f6':
  Spiffy new compatibility mode UI.
 2011-05-26 11:02:52 -07:00
Wink Saville
8f59d0771a Merge "Remove or disable some verbose debugging." into honeycomb-LTE 2011-05-26 10:55:46 -07:00
Dianne Hackborn
86374d16ce am 42f8094c: Merge "Spiffy new compatibility mode UI." into honeycomb-mr2 
* commit '42f8094c066209a65b09d53611ef5c93daba4c51':
  Spiffy new compatibility mode UI.
 2011-05-26 10:00:00 -07:00
Dianne Hackborn
0e7b61f1c3 Merge "Spiffy new compatibility mode UI." into honeycomb-mr2 2011-05-25 21:18:36 -07:00
Jeff Brown
c2dac80166 am a4e74744: am fa574c0e: Merge "Touch pad UX improvements." into honeycomb-mr2 
* commit 'a4e747445ac0bdd2cc561802c9c7abfedbd0d981':
  Touch pad UX improvements.
 2011-05-25 19:19:01 -07:00
Jeff Brown
de51c0988e am fa574c0e: Merge "Touch pad UX improvements." into honeycomb-mr2 
* commit 'fa574c0e0ce7f84eea34e96dededea35329dbd18':
  Touch pad UX improvements.
 2011-05-25 19:16:39 -07:00
Jeff Brown
ab184a4855 Merge "Touch pad UX improvements." into honeycomb-mr2 2011-05-25 19:15:24 -07:00
Jeff Brown
17c614e241 am 919a2efe: am 5665770b: Merge "Fix deadlock in dispatcher. (DO NOT MERGE)" into honeycomb-mr2 
* commit '919a2efeeff6c5ac0dc36883c84d13ed4ca6bce2':
  Fix deadlock in dispatcher. (DO NOT MERGE)
 2011-05-25 19:00:42 -07:00
Jeff Brown
657467eccd am 5665770b: Merge "Fix deadlock in dispatcher. (DO NOT MERGE)" into honeycomb-mr2 
* commit '5665770bc4449a96f2365bec71fb012ca2e7bc81':
  Fix deadlock in dispatcher. (DO NOT MERGE)
 2011-05-25 18:58:22 -07:00
Jeff Brown
8808af5c05 Merge "Fix deadlock in dispatcher. (DO NOT MERGE)" into honeycomb-mr2 2011-05-25 18:55:52 -07:00
Adam Powell
48fcbcf299 am b017632d: am 5a328f0f: Merge "Updated popup dialog 9 patches (light)" into honeycomb-mr2 
* commit 'b017632dad1c6a89cbdc02a9fa7a0029a7dbac12':
  Updated popup dialog 9 patches (light)
 2011-05-25 18:16:48 -07:00
Adam Powell
cf9055682e am 5a328f0f: Merge "Updated popup dialog 9 patches (light)" into honeycomb-mr2 
* commit '5a328f0f7cf88a2b917db15aec9f9d1714db3e06':
  Updated popup dialog 9 patches (light)
 2011-05-25 18:12:40 -07:00
Adam Powell
d97a0b6d77 Merge "Updated popup dialog 9 patches (light)" into honeycomb-mr2 2011-05-25 18:10:22 -07:00
Joe Onorato
a20423e141 am 94a06bd8: am 6fb093b1: Merge "Move status bar icons to sw600." into honeycomb-mr2 
* commit '94a06bd8db0d19be3108bd2ee709373f80318c8b':
  Move status bar icons to sw600.
 2011-05-25 17:42:27 -07:00
Joe Onorato
a343131719 am 6fb093b1: Merge "Move status bar icons to sw600." into honeycomb-mr2 
* commit '6fb093b14bb1bf4b933a5f624b03085977d12ff9':
  Move status bar icons to sw600.
 2011-05-25 17:39:04 -07:00