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

91649 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Katie McCormick
fa4865f680 resolved conflicts for merge of 0b479e43 to jb-dev 
Change-Id: I04bc45425f11b3562a4219719716c55eaff2228e
 2012-10-10 11:09:03 -07:00
Casey Burkhardt
8af30c0ee5 Update to accessibility toggle message. 
Change-Id: I9957b86f3424d800b1b9804dc77f5bc5b728922b
 2012-10-10 10:51:56 -07:00
&& repo sync -j8
0b479e4379 Merge "Doc changes: misc GCM updates." into jb-dev-docs 2012-10-10 10:34:48 -07:00
Craig Mautner
7dfcb01820 Increase window freeze timeout for bigger screens. 
More pixels take longer. Timeout was occurring before Status and
Navigation Bars were finished drawing causing them to animate in
during rotations.

Bug 7307718 fixed.

Change-Id: Iccf27b6172d0c9831690cc2fcf93027a40b705d8
 2012-10-10 10:24:47 -07:00
Zhihai Xu
7717e48584 am 859dbd89: am 5ac58157: am 25144566: Merge "Bluetooth multi-user updates: change bluetooth manager system service to reject background user access. disable and enable Bluetooth when user is switched" into jb-mr1-dev 
* commit '859dbd89df773f1ace87419462c52b620745d46f':
  Bluetooth multi-user updates: change bluetooth manager system service to reject background user access. disable and enable Bluetooth when user is switched
 2012-10-10 09:59:27 -07:00
The Android Automerger
c46e87a0a2 merge in jb-mr1-release history after reset to jb-mr1-dev 2012-10-10 09:58:32 -07:00
Zhihai Xu
859dbd89df am 5ac58157: am 25144566: Merge "Bluetooth multi-user updates: change bluetooth manager system service to reject background user access. disable and enable Bluetooth when user is switched" into jb-mr1-dev 
* commit '5ac58157376194f7e9fb19fe4cda65cdbf859155':
  Bluetooth multi-user updates: change bluetooth manager system service to reject background user access. disable and enable Bluetooth when user is switched
 2012-10-10 09:57:06 -07:00
Zhihai Xu
5ac5815737 am 25144566: Merge "Bluetooth multi-user updates: change bluetooth manager system service to reject background user access. disable and enable Bluetooth when user is switched" into jb-mr1-dev 
* commit '251445667ce045c4425c10fb24e3e23f90a210c0':
  Bluetooth multi-user updates: change bluetooth manager system service to reject background user access. disable and enable Bluetooth when user is switched
 2012-10-10 09:55:41 -07:00
Zhihai Xu
251445667c Merge "Bluetooth multi-user updates: change bluetooth manager system service to reject background user access. disable and enable Bluetooth when user is switched" into jb-mr1-dev 2012-10-10 09:52:33 -07:00
The Android Automerger
4c5ba6c266 merge in jb-mr1-release history after reset to jb-mr1-dev 2012-10-10 09:52:11 -07:00
The Android Open Source Project
d22587df13 am 41af5ae7: (-s ours) Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge 
* commit '41af5ae76e4b15d5ae7e8da91d635c21132b972f':
 2012-10-10 09:47:56 -07:00
The Android Open Source Project
41af5ae76e Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge 
Change-Id: Iae42f543addb4ce2e4640568c1266892006456a3
 2012-10-10 09:44:34 -07:00
Ken Wakasa
6637d1040a am 72da683c: am b8e6a972: am 1a5f387b: Merge "Revert "Don\'t update the text services locale in the main thread"" into jb-mr1-dev 
* commit '72da683c6edf23678fdd3f53d777811bb5bbe1f2':
  Revert "Don't update the text services locale in the main thread"
 2012-10-10 09:39:53 -07:00
Ken Wakasa
72da683c6e am b8e6a972: am 1a5f387b: Merge "Revert "Don\'t update the text services locale in the main thread"" into jb-mr1-dev 
* commit 'b8e6a9724e33e01abc6261f3387e4671b0244f45':
  Revert "Don't update the text services locale in the main thread"
 2012-10-10 09:37:51 -07:00
Ken Wakasa
b8e6a9724e am 1a5f387b: Merge "Revert "Don\'t update the text services locale in the main thread"" into jb-mr1-dev 
* commit '1a5f387bcf26a6845a4fa744b8f54449ae70082f':
  Revert "Don't update the text services locale in the main thread"
 2012-10-10 09:35:12 -07:00
Ken Wakasa
1a5f387bcf Merge "Revert "Don't update the text services locale in the main thread"" into jb-mr1-dev 2012-10-10 09:32:36 -07:00
Geremy Condra
9f82b38928 am 1336a8d9: (-s ours) am 2b5541cb: am ba683efa: am 3f542740: (-s ours) am c2e3be5a: Merge "DO NOT MERGE Control access to inherited methods of jsinterface objects" into jb-dev 
* commit '1336a8d910c5eb12832d7612cb5f605ff245fd3a':
  DO NOT MERGE Control access to inherited methods of jsinterface objects
 2012-10-10 09:26:56 -07:00
Geremy Condra
813cd06e6d am ba869923: (-s ours) am 0b7ee872: am 96a294de: am dadea723: (-s ours) am a22000d2: Merge "DO NOT MERGE remove defunct javascript interface" into jb-dev 
* commit 'ba869923d4664b1e6c960fe010c4763f47c4975f':
  DO NOT MERGE remove defunct javascript interface
 2012-10-10 09:26:53 -07:00
Dirk Dougherty
6522a94742 am dcf69a4b: am 4fd178d2: am 1ed1a440: am 0c9c8d0a: am 137b8f4c: am f761a9a6: Merge "Doc change: edits to TV tablet story." into jb-dev-docs 
* commit 'dcf69a4baad217f8c4c7956fa12db3cbf5896848':
  Doc change: edits to TV tablet story.
 2012-10-10 09:26:49 -07:00
Dirk Dougherty
bfb8b3fb98 am 6f4f3236: am 0370377f: am 8ff081d2: am 8048b9ec: am 28a40e01: am aa0d43ba: Merge "Doc change: Link to AVDs docs from tablet quality checklist." into jb-dev-docs 
* commit '6f4f32369355ddcb83a950672b45e99000fd42c9':
  Doc change: Link to AVDs docs from tablet quality checklist.
 2012-10-10 09:26:43 -07:00
Geremy Condra
1336a8d910 am 2b5541cb: am ba683efa: am 3f542740: (-s ours) am c2e3be5a: Merge "DO NOT MERGE Control access to inherited methods of jsinterface objects" into jb-dev 
* commit '2b5541cbafc09f7973bb21d78ff7b0fdcb571999':
  DO NOT MERGE Control access to inherited methods of jsinterface objects
 2012-10-10 09:24:08 -07:00
Geremy Condra
ba869923d4 am 0b7ee872: am 96a294de: am dadea723: (-s ours) am a22000d2: Merge "DO NOT MERGE remove defunct javascript interface" into jb-dev 
* commit '0b7ee8729309c3b5654eadecc9e29f22455e8ae7':
  DO NOT MERGE remove defunct javascript interface
 2012-10-10 09:24:04 -07:00
Dirk Dougherty
dcf69a4baa am 4fd178d2: am 1ed1a440: am 0c9c8d0a: am 137b8f4c: am f761a9a6: Merge "Doc change: edits to TV tablet story." into jb-dev-docs 
* commit '4fd178d28b6a9d331e491fbe3919926fc5a481d7':
  Doc change: edits to TV tablet story.
 2012-10-10 09:24:01 -07:00
Dirk Dougherty
6f4f323693 am 0370377f: am 8ff081d2: am 8048b9ec: am 28a40e01: am aa0d43ba: Merge "Doc change: Link to AVDs docs from tablet quality checklist." into jb-dev-docs 
* commit '0370377f36c972a58974c6403a7d2d46ca1cb0e1':
  Doc change: Link to AVDs docs from tablet quality checklist.
 2012-10-10 09:23:57 -07:00
Geremy Condra
2b5541cbaf am ba683efa: am 3f542740: (-s ours) am c2e3be5a: Merge "DO NOT MERGE Control access to inherited methods of jsinterface objects" into jb-dev 
* commit 'ba683efa4134c36f1cf1e7c5ef447ce7068f64c6':
  DO NOT MERGE Control access to inherited methods of jsinterface objects
 2012-10-10 09:20:36 -07:00
Geremy Condra
0b7ee87293 am 96a294de: am dadea723: (-s ours) am a22000d2: Merge "DO NOT MERGE remove defunct javascript interface" into jb-dev 
* commit '96a294de1f0c6b86499531f990b6a60ed1c24459':
  DO NOT MERGE remove defunct javascript interface
 2012-10-10 09:20:33 -07:00
Dirk Dougherty
4fd178d28b am 1ed1a440: am 0c9c8d0a: am 137b8f4c: am f761a9a6: Merge "Doc change: edits to TV tablet story." into jb-dev-docs 
* commit '1ed1a44073816d288e6bfda5d575ed9a692626a7':
  Doc change: edits to TV tablet story.
 2012-10-10 09:20:29 -07:00
Dirk Dougherty
0370377f36 am 8ff081d2: am 8048b9ec: am 28a40e01: am aa0d43ba: Merge "Doc change: Link to AVDs docs from tablet quality checklist." into jb-dev-docs 
* commit '8ff081d204a0624c793f75082877aedcf6a999ca':
  Doc change: Link to AVDs docs from tablet quality checklist.
 2012-10-10 09:20:24 -07:00
Geremy Condra
ba683efa41 am 3f542740: (-s ours) am c2e3be5a: Merge "DO NOT MERGE Control access to inherited methods of jsinterface objects" into jb-dev 
* commit '3f542740065f3708f70acb48dd93651ed896e029':
  DO NOT MERGE Control access to inherited methods of jsinterface objects
 2012-10-10 09:17:59 -07:00
Geremy Condra
96a294de1f am dadea723: (-s ours) am a22000d2: Merge "DO NOT MERGE remove defunct javascript interface" into jb-dev 
* commit 'dadea723a3e4485d2ee450ce76e772da33477f80':
  DO NOT MERGE remove defunct javascript interface
 2012-10-10 09:17:56 -07:00
Dirk Dougherty
1ed1a44073 am 0c9c8d0a: am 137b8f4c: am f761a9a6: Merge "Doc change: edits to TV tablet story." into jb-dev-docs 
* commit '0c9c8d0a065ca56676e09688c0f643904eac1c69':
  Doc change: edits to TV tablet story.
 2012-10-10 09:17:49 -07:00
Dirk Dougherty
8ff081d204 am 8048b9ec: am 28a40e01: am aa0d43ba: Merge "Doc change: Link to AVDs docs from tablet quality checklist." into jb-dev-docs 
* commit '8048b9ec0c1ecc7fbe557105b87ba21329fe6169':
  Doc change: Link to AVDs docs from tablet quality checklist.
 2012-10-10 09:17:48 -07:00
Ken Wakasa
72fa0b35c5 Revert "Don't update the text services locale in the main thread" 
This reverts commit 8fa0838bf82f43acfabc0e7fe9471e488a97796b

Change-Id: Ie790ae6dcb33d05d1fbf86c8ef28aec6fe60793a
 2012-10-10 09:17:18 -07:00
The Android Automerger
e50b212e32 merge in jb-mr1-factory-release history after reset to jb-mr1-dev 2012-10-10 08:55:14 -07:00
Marco Nelissen
91d7b4f326 am 0419ebaf: am 450b713e: am 437e9cc3: Merge "Adjust buffer position after copying" into jb-mr1-dev 
* commit '0419ebafbac72ccbcb53a68b24e29265962f50fd':
  Adjust buffer position after copying
 2012-10-10 08:42:23 -07:00
Jeff Brown
22808eef52 am 280e50f1: am 3f0d9580: am f6138f07: Merge "Don\'t consider the boot completed until the animation is over." into jb-mr1-dev 
* commit '280e50f197e6c8ba52a05982fb2ce2cb2a8071fb':
  Don't consider the boot completed until the animation is over.
 2012-10-10 08:42:19 -07:00
Jeff Sharkey
86e0935a1f am ebb97455: am 62dee3d8: am 0fca2a3e: Merge "Fix build, only invalidate when creating user." into jb-mr1-dev 
* commit 'ebb97455327161157432fc0f3effce27990075e5':
  Fix build, only invalidate when creating user.
 2012-10-10 08:42:15 -07:00
Jeff Sharkey
4a55653e34 am abd0c099: am 45ed828a: am c85e16ca: Merge "Make RegisteredServicesCache multi-user aware." into jb-mr1-dev 
* commit 'abd0c099c75d85ebca9281c7937b5b5b86f6066f':
  Make RegisteredServicesCache multi-user aware.
 2012-10-10 08:42:10 -07:00
Satoshi Kataoka
ad9d695ecc am 78bd3854: am 27e2b6c2: am 0aaffb14: Merge "Don\'t update the text services locale in the main thread" into jb-mr1-dev 
* commit '78bd3854c63261cc01321ebb41a29d9302ae1b8f':
  Don't update the text services locale in the main thread
 2012-10-10 08:42:07 -07:00
Yu Shan Emily Lau
cdc47ba82c am 717073a9: am d2e2685b: am d175a75d: Merge "Instead of collecting the procmem output in the test, change it as optional. This is to avoid the tool breakage will block the whole memory test sutie." into jb-mr1-dev 
* commit '717073a94ea1b4ca12c9e185dcd6ac3da80fcd69':
  Instead of collecting the procmem output in the test, change it as optional. This is to avoid the tool breakage will block the whole memory test sutie.
 2012-10-10 08:42:02 -07:00
Svetoslav Ganov
3c444d2c13 am de9e026f: am d849afb1: am a726e23d: Merge "Cannot force a shown item from an ActionMode into the overflow menu." into jb-mr1-dev 
* commit 'de9e026f10fde0726db97af002989b1248e4aa51':
  Cannot force a shown item from an ActionMode into the overflow menu.
 2012-10-10 08:41:58 -07:00
Marco Nelissen
0419ebafba am 450b713e: am 437e9cc3: Merge "Adjust buffer position after copying" into jb-mr1-dev 
* commit '450b713e83e2e45e43df06649e377c50e33922d4':
  Adjust buffer position after copying
 2012-10-10 08:38:12 -07:00
Jeff Brown
280e50f197 am 3f0d9580: am f6138f07: Merge "Don\'t consider the boot completed until the animation is over." into jb-mr1-dev 
* commit '3f0d9580210d96f9cd1b440c6754d5e30cbd387d':
  Don't consider the boot completed until the animation is over.
 2012-10-10 08:38:07 -07:00
Jeff Sharkey
ebb9745532 am 62dee3d8: am 0fca2a3e: Merge "Fix build, only invalidate when creating user." into jb-mr1-dev 
* commit '62dee3d8ebb3a1d1e0adfb61c9ed505ecf8e2a85':
  Fix build, only invalidate when creating user.
 2012-10-10 08:38:03 -07:00
Jeff Sharkey
abd0c099c7 am 45ed828a: am c85e16ca: Merge "Make RegisteredServicesCache multi-user aware." into jb-mr1-dev 
* commit '45ed828ae2f8030186da8aa9848764f4a9f32224':
  Make RegisteredServicesCache multi-user aware.
 2012-10-10 08:38:00 -07:00
Satoshi Kataoka
78bd3854c6 am 27e2b6c2: am 0aaffb14: Merge "Don\'t update the text services locale in the main thread" into jb-mr1-dev 
* commit '27e2b6c25f17af7515e405d7a6a4a8f9cf1225b3':
  Don't update the text services locale in the main thread
 2012-10-10 08:37:56 -07:00
Yu Shan Emily Lau
717073a94e am d2e2685b: am d175a75d: Merge "Instead of collecting the procmem output in the test, change it as optional. This is to avoid the tool breakage will block the whole memory test sutie." into jb-mr1-dev 
* commit 'd2e2685b71e5851635a1e335391bff3e372372b0':
  Instead of collecting the procmem output in the test, change it as optional. This is to avoid the tool breakage will block the whole memory test sutie.
 2012-10-10 08:37:49 -07:00
Svetoslav Ganov
de9e026f10 am d849afb1: am a726e23d: Merge "Cannot force a shown item from an ActionMode into the overflow menu." into jb-mr1-dev 
* commit 'd849afb172e9e82a6814baa5c6d2fdcb8cf7736b':
  Cannot force a shown item from an ActionMode into the overflow menu.
 2012-10-10 08:37:46 -07:00
Marco Nelissen
450b713e83 am 437e9cc3: Merge "Adjust buffer position after copying" into jb-mr1-dev 
* commit '437e9cc388da5e289f38172c6164e7ad7962272b':
  Adjust buffer position after copying
 2012-10-10 08:34:00 -07:00
Jeff Brown
3f0d958021 am f6138f07: Merge "Don\'t consider the boot completed until the animation is over." into jb-mr1-dev 
* commit 'f6138f0720e678f236fe8c442a7660a955da9d10':
  Don't consider the boot completed until the animation is over.
 2012-10-10 08:33:57 -07:00