drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
91,712 Commits 1 Branch 0 Tags
Commit Graph

91712 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jeff Brown
943d52f6f2 am 44877a16: am 35499475: am 17026864: Merge "Ensure Binder in-calls to UiModeManagerService are guarded." into jb-mr1-dev 
* commit '44877a16e7313e0523975b5511107631fabc8115':
  Ensure Binder in-calls to UiModeManagerService are guarded.
 2012-10-11 17:53:12 -07:00
Craig Mautner
e75ded7c0d am 567f47b8: am a37994b2: am 46fb9e9f: Merge "Check for apps closing and restore mExiting test." into jb-mr1-dev 
* commit '567f47b8aa0789c1631e9a5a275c787d1eee2311':
  Check for apps closing and restore mExiting test.
 2012-10-11 17:53:08 -07:00
Chris Wren
44e1c77d24 am b62302dd: am 9b339b74: am 853a1cea: Merge "Copy date format style from keyguard." into jb-mr1-dev 
* commit 'b62302dd2b315a238a896538adc1de0383280111':
  Copy date format style from keyguard.
 2012-10-11 17:53:02 -07:00
Joe Fernandez
325176585a am 3a3014c1: am 95f9b4b9: am 8091c8e9: am 07d2ad88: am dff6f01f: am 45c56ae7: Merge "docs: Release Notes: Android Platform 4.1.2 (16, r3)" into jb-dev-docs 
* commit '3a3014c152c624c2d04e64619494eb5ebb72226d':
  docs: Release Notes: Android Platform 4.1.2 (16, r3)
 2012-10-11 17:52:58 -07:00
Adam Powell
90ef752146 am ff99f59f: am 4e5efaef: am 49dbc161: Merge "Revert "Fixed group and child view caching in SimpleExpandableListAdapter."" into jb-mr1-dev 
* commit 'ff99f59f0bd30f6e475bf5adf358acb4d737cc51':
  Revert "Fixed group and child view caching in SimpleExpandableListAdapter."
 2012-10-11 17:52:54 -07:00
Fabrice Di Meglio
0c5c23b3a2 am 4c95bfd5: am 39b0c29e: am ec139240: Merge "Fix bug #7325234 LayoutParams are not resolved correctly (Settings apps looks broken on Manta in Arabic)" into jb-mr1-dev 
* commit '4c95bfd5ad4d17b6e0e618cd3244ee2d33bcbda1':
  Fix bug #7325234 LayoutParams are not resolved correctly (Settings apps looks broken on Manta in Arabic)
 2012-10-11 17:52:51 -07:00
Winson Chung
5d8080f8b8 am ef36a549: am f0a8045e: am ee0d8deb: Merge "Skip merge and assign RemoteViews directly if updateAppWidget() has not been called. (Bug 7214731)" into jb-mr1-dev 
* commit 'ef36a5494249c57855a5eabd6a5536d8447c1b68':
  Skip merge and assign RemoteViews directly if updateAppWidget() has not been called. (Bug 7214731)
 2012-10-11 17:52:47 -07:00
Svetoslav Ganov
4cc7342daf am cf19242d: am 756cf7e8: am b3c38156: Merge "Screen magnification does not auto-pan when fragment dialog pops up." into jb-mr1-dev 
* commit 'cf19242d7b9688220cf821fe598de35d932ca2d2':
  Screen magnification does not auto-pan when fragment dialog pops up.
 2012-10-11 17:52:43 -07:00
Winson Chung
8cf2271c48 am c68bab01: am 8e981df7: am 1cd614c6: Merge "Ignore dying users when testing for number of users on device. (Bug 7332248)" into jb-mr1-dev 
* commit 'c68bab01afab58baafa3c0cd357e781c7cb7495f':
  Ignore dying users when testing for number of users on device. (Bug 7332248)
 2012-10-11 17:52:39 -07:00
Chris Wren
d8a9a77537 am f66bf0e8: am a35f8ce3: am 061a4de8: Merge "resolve conflicting assumptions from the merge." into jb-mr1-dev 
* commit 'f66bf0e86790e5864bb018b2fa778456ea561e68':
  resolve conflicting assumptions from the merge.
 2012-10-11 17:52:35 -07:00
Dave Burke
6e9cb82eeb am d4aa3b68: am 950407d0: am a2f7ca7d: Merge "Add new ringtones/notifications for Occam." into jb-mr1-dev 
* commit 'd4aa3b68940e5aaf2883f7a63bc50924590d373a':
  Add new ringtones/notifications for Occam.
 2012-10-11 17:52:31 -07:00
Danielle Millett
8bb1f5abc4 am 855bdf65: am 85a4ac92: am 8f89e6f8: Merge "Face Unlock is shown correctly during a phone call - fix b/7271718" into jb-mr1-dev 
* commit '855bdf6500edfc4496002367638c577318b0b912':
  Face Unlock is shown correctly during a phone call - fix b/7271718
 2012-10-11 17:52:28 -07:00
Daniel Sandler
972e834943 am bfd97573: am 22cc5c76: am ff97e6e8: Merge "New icon for quick settings button." into jb-mr1-dev 
* commit 'bfd97573053ab549b1815ed75e5f72cc8c965e4c':
  New icon for quick settings button.
 2012-10-11 17:52:24 -07:00
Svetoslav Ganov
7510e4820b resolved conflicts for merge of a7f38925 to master 
Change-Id: If0e3a1046dfeef9260284e84f2a74525ddea00f7
 2012-10-11 17:49:28 -07:00
Jeff Sharkey
98a8a3552d am e0fec434: am 1cf5bd2a: am 26e3f3df: Merge "Database cleanup needs to happen for all users." into jb-mr1-dev 
* commit 'e0fec43459ded4f304d6bd3d8f07e3acedcb5a11':
  Database cleanup needs to happen for all users.
 2012-10-11 17:18:42 -07:00
Adam Cohen
1c3bbfc7a4 am 68794263: am 2514cbc2: am e60cdf12: Merge "Final keyguard tablet layout integration" into jb-mr1-dev 
* commit '6879426372c707d1b67cff549fae523621884304':
  Final keyguard tablet layout integration
 2012-10-11 17:18:37 -07:00
Svetoslav Ganov
6fdd3176e6 am 02942145: am a1489d30: am 9aefa145: Merge "Send accessibility event for content change upon setting content description." into jb-mr1-dev 
* commit '0294214519df70978b5440b01ec6c2597f4eecec':
  Send accessibility event for content change upon setting content description.
 2012-10-11 17:18:33 -07:00
Daniel Sandler
37a6049782 am 8c17d23e: am 09a4a4c2: am 092ad66a: Merge changes Ic860de75,I8b2d6c7a into jb-mr1-dev 
* commit '8c17d23e41d7f53966bbcbfcc51229d33d2837d5':
  Remove notification/quicksettings explanation cling.
  Remove the double-swipe to access quick settings on phones.
 2012-10-11 17:18:29 -07:00
Dianne Hackborn
b10d82597b am fc31380a: am ff363aa9: am 2a3e1ffd: Merge "More on issue #7318666: hide developer options from user build" into jb-mr1-dev 
* commit 'fc31380adf4272c11bc32fab1dcea75804ad3166':
  More on issue #7318666: hide developer options from user build
 2012-10-11 17:18:25 -07:00
Satoshi Kataoka
bc58774037 am 95189b92: am 6a1d4b99: am 8e767115: Merge "Don\'t update the text services locale in the main thread" into jb-mr1-dev 
* commit '95189b92259529997cfa4d15b5ffd060d9f99a51':
  Don't update the text services locale in the main thread
 2012-10-11 17:18:18 -07:00
Baligh Uddin
93c6a19ffb am 31f3d527: (-s ours) am bcace62f: am 524dcb7e: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 
* commit '31f3d527baea67073a509fda4b3063f58b2aebce':
  Import translations. DO NOT MERGE
 2012-10-11 17:18:11 -07:00
Jeff Brown
44877a16e7 am 35499475: am 17026864: Merge "Ensure Binder in-calls to UiModeManagerService are guarded." into jb-mr1-dev 
* commit '35499475d238b6f4f5a07fd59dcddc4bc391f0d8':
  Ensure Binder in-calls to UiModeManagerService are guarded.
 2012-10-11 17:13:08 -07:00
Craig Mautner
567f47b8aa am a37994b2: am 46fb9e9f: Merge "Check for apps closing and restore mExiting test." into jb-mr1-dev 
* commit 'a37994b2b4e2fe02c93c40699442c7a13052c57c':
  Check for apps closing and restore mExiting test.
 2012-10-11 17:13:03 -07:00
Chris Wren
b62302dd2b am 9b339b74: am 853a1cea: Merge "Copy date format style from keyguard." into jb-mr1-dev 
* commit '9b339b740efd2e7ae477126187d622efd76319de':
  Copy date format style from keyguard.
 2012-10-11 17:12:56 -07:00
Joe Fernandez
3a3014c152 am 95f9b4b9: am 8091c8e9: am 07d2ad88: am dff6f01f: am 45c56ae7: Merge "docs: Release Notes: Android Platform 4.1.2 (16, r3)" into jb-dev-docs 
* commit '95f9b4b9a5299c0c2902d932ee4039c51a109c3c':
  docs: Release Notes: Android Platform 4.1.2 (16, r3)
 2012-10-11 17:12:51 -07:00
Adam Powell
ff99f59f0b am 4e5efaef: am 49dbc161: Merge "Revert "Fixed group and child view caching in SimpleExpandableListAdapter."" into jb-mr1-dev 
* commit '4e5efaef793c58ff014265eab7f11c3ded34b2ed':
  Revert "Fixed group and child view caching in SimpleExpandableListAdapter."
 2012-10-11 17:12:47 -07:00
Fabrice Di Meglio
4c95bfd5ad am 39b0c29e: am ec139240: Merge "Fix bug #7325234 LayoutParams are not resolved correctly (Settings apps looks broken on Manta in Arabic)" into jb-mr1-dev 
* commit '39b0c29e4f6582420518f1124af262865797339d':
  Fix bug #7325234 LayoutParams are not resolved correctly (Settings apps looks broken on Manta in Arabic)
 2012-10-11 17:12:32 -07:00
Winson Chung
ef36a54942 am f0a8045e: am ee0d8deb: Merge "Skip merge and assign RemoteViews directly if updateAppWidget() has not been called. (Bug 7214731)" into jb-mr1-dev 
* commit 'f0a8045e727e9bff08b4890521912afc6564a895':
  Skip merge and assign RemoteViews directly if updateAppWidget() has not been called. (Bug 7214731)
 2012-10-11 17:12:26 -07:00
Svetoslav Ganov
cf19242d7b am 756cf7e8: am b3c38156: Merge "Screen magnification does not auto-pan when fragment dialog pops up." into jb-mr1-dev 
* commit '756cf7e88294905f0dfa6a25981e0592e1df1689':
  Screen magnification does not auto-pan when fragment dialog pops up.
 2012-10-11 17:12:22 -07:00
Winson Chung
c68bab01af am 8e981df7: am 1cd614c6: Merge "Ignore dying users when testing for number of users on device. (Bug 7332248)" into jb-mr1-dev 
* commit '8e981df711c6991eba437dccde803828df60b24f':
  Ignore dying users when testing for number of users on device. (Bug 7332248)
 2012-10-11 17:12:14 -07:00
Chris Wren
f66bf0e867 am a35f8ce3: am 061a4de8: Merge "resolve conflicting assumptions from the merge." into jb-mr1-dev 
* commit 'a35f8ce39ff86e8ad1ce905ba58112d7e2f8684a':
  resolve conflicting assumptions from the merge.
 2012-10-11 17:12:10 -07:00
Dave Burke
d4aa3b6894 am 950407d0: am a2f7ca7d: Merge "Add new ringtones/notifications for Occam." into jb-mr1-dev 
* commit '950407d09e02181af7553690418f304da417f372':
  Add new ringtones/notifications for Occam.
 2012-10-11 17:12:03 -07:00
Danielle Millett
855bdf6500 am 85a4ac92: am 8f89e6f8: Merge "Face Unlock is shown correctly during a phone call - fix b/7271718" into jb-mr1-dev 
* commit '85a4ac9281f5e592dead0f20146e4f154efd7c78':
  Face Unlock is shown correctly during a phone call - fix b/7271718
 2012-10-11 17:11:50 -07:00
Daniel Sandler
bfd9757305 am 22cc5c76: am ff97e6e8: Merge "New icon for quick settings button." into jb-mr1-dev 
* commit '22cc5c76d08bbd1017d06f0157b6801b7c38870c':
  New icon for quick settings button.
 2012-10-11 17:11:43 -07:00
Svetoslav Ganov
a7f38925f7 am d3e5180f: am d07fa6e0: Merge "Prevent out of range magnification scale to be persisted." into jb-mr1-dev 
* commit 'd3e5180f7cec9df97e983f228aa753efcd193013':
  Prevent out of range magnification scale to be persisted.
 2012-10-11 17:11:37 -07:00
Jeff Sharkey
e0fec43459 am 1cf5bd2a: am 26e3f3df: Merge "Database cleanup needs to happen for all users." into jb-mr1-dev 
* commit '1cf5bd2aeb983e09e7e4b664b1380c30b94b4d50':
  Database cleanup needs to happen for all users.
 2012-10-11 17:11:19 -07:00
Adam Cohen
6879426372 am 2514cbc2: am e60cdf12: Merge "Final keyguard tablet layout integration" into jb-mr1-dev 
* commit '2514cbc218923cb5e2270ebd9be19d2c9aad356e':
  Final keyguard tablet layout integration
 2012-10-11 17:11:13 -07:00
Svetoslav Ganov
0294214519 am a1489d30: am 9aefa145: Merge "Send accessibility event for content change upon setting content description." into jb-mr1-dev 
* commit 'a1489d302289e92e7135452db3fee446e2452535':
  Send accessibility event for content change upon setting content description.
 2012-10-11 17:11:09 -07:00
Daniel Sandler
8c17d23e41 am 09a4a4c2: am 092ad66a: Merge changes Ic860de75,I8b2d6c7a into jb-mr1-dev 
* commit '09a4a4c29c42ddb7c515a10911db108f77de2e0c':
  Remove notification/quicksettings explanation cling.
  Remove the double-swipe to access quick settings on phones.
 2012-10-11 17:11:02 -07:00
Dianne Hackborn
fc31380adf am ff363aa9: am 2a3e1ffd: Merge "More on issue #7318666: hide developer options from user build" into jb-mr1-dev 
* commit 'ff363aa967749803cd2e6cf598d4bfaae397a1bb':
  More on issue #7318666: hide developer options from user build
 2012-10-11 17:10:54 -07:00
Satoshi Kataoka
95189b9225 am 6a1d4b99: am 8e767115: Merge "Don\'t update the text services locale in the main thread" into jb-mr1-dev 
* commit '6a1d4b998cb543093b99dcabffaf849686eea656':
  Don't update the text services locale in the main thread
 2012-10-11 17:10:50 -07:00
Baligh Uddin
31f3d527ba am bcace62f: am 524dcb7e: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 
* commit 'bcace62f72efa7dd1722b86837af2399c9507beb':
  Import translations. DO NOT MERGE
 2012-10-11 17:10:38 -07:00
Jeff Brown
35499475d2 am 17026864: Merge "Ensure Binder in-calls to UiModeManagerService are guarded." into jb-mr1-dev 
* commit '17026864e846630da7b619b55c5a65311484656c':
  Ensure Binder in-calls to UiModeManagerService are guarded.
 2012-10-11 14:57:05 -07:00
Jeff Brown
17026864e8 Merge "Ensure Binder in-calls to UiModeManagerService are guarded." into jb-mr1-dev 2012-10-11 14:53:54 -07:00
Craig Mautner
a37994b2b4 am 46fb9e9f: Merge "Check for apps closing and restore mExiting test." into jb-mr1-dev 
* commit '46fb9e9f226c234c2b95428b8827df3cb0333cde':
  Check for apps closing and restore mExiting test.
 2012-10-11 14:52:15 -07:00
Craig Mautner
46fb9e9f22 Merge "Check for apps closing and restore mExiting test." into jb-mr1-dev 2012-10-11 14:48:57 -07:00
Chris Wren
9b339b740e am 853a1cea: Merge "Copy date format style from keyguard." into jb-mr1-dev 
* commit '853a1ceae056d773a41716a8a586118be1fa9dac':
  Copy date format style from keyguard.
 2012-10-11 14:45:56 -07:00
Joe Fernandez
95f9b4b9a5 am 8091c8e9: am 07d2ad88: am dff6f01f: am 45c56ae7: Merge "docs: Release Notes: Android Platform 4.1.2 (16, r3)" into jb-dev-docs 
* commit '8091c8e996fa6a5650319661b3aecb3870651191':
  docs: Release Notes: Android Platform 4.1.2 (16, r3)
 2012-10-11 14:43:02 -07:00
Chris Wren
853a1ceae0 Merge "Copy date format style from keyguard." into jb-mr1-dev 2012-10-11 14:42:33 -07:00
Joe Fernandez
8091c8e996 am 07d2ad88: am dff6f01f: am 45c56ae7: Merge "docs: Release Notes: Android Platform 4.1.2 (16, r3)" into jb-dev-docs 
* commit '07d2ad883b43a80469ec881421d544ff3b75c50a':
  docs: Release Notes: Android Platform 4.1.2 (16, r3)
 2012-10-11 14:40:44 -07:00