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

87266 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Baligh Uddin
b9ef3c682c Import translations. DO NOT MERGE 
Change-Id: I2a6865b2b088d0fcd9a5e8b24c0f9095ecbb3c68
Auto-generated-cl: translation import
 2012-10-10 13:33:19 -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
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
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
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
Jeff Sharkey
62dee3d8eb am 0fca2a3e: Merge "Fix build, only invalidate when creating user." into jb-mr1-dev 
* commit '0fca2a3e229b3909b389882873d5894a0008f485':
  Fix build, only invalidate when creating user.
 2012-10-10 08:33:52 -07:00
Jeff Sharkey
45ed828ae2 am c85e16ca: Merge "Make RegisteredServicesCache multi-user aware." into jb-mr1-dev 
* commit 'c85e16cafb777607e6c38e1843c5fa194b8086b3':
  Make RegisteredServicesCache multi-user aware.
 2012-10-10 08:33:49 -07:00
Satoshi Kataoka
27e2b6c25f am 0aaffb14: Merge "Don\'t update the text services locale in the main thread" into jb-mr1-dev 
* commit '0aaffb14c8e243433bab1a1bd5773005f0f17699':
  Don't update the text services locale in the main thread
 2012-10-10 08:33:45 -07:00
Yu Shan Emily Lau
d2e2685b71 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 'd175a75d9f4d0b0d32db8ccaeead935687072605':
  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:33:41 -07:00
Svetoslav Ganov
d849afb172 am a726e23d: Merge "Cannot force a shown item from an ActionMode into the overflow menu." into jb-mr1-dev 
* commit 'a726e23d7b13824ede2cdc185ce846238d348604':
  Cannot force a shown item from an ActionMode into the overflow menu.
 2012-10-10 08:33:37 -07:00
Marco Nelissen
437e9cc388 Merge "Adjust buffer position after copying" into jb-mr1-dev 2012-10-10 08:06:58 -07:00
Jeff Brown
f6138f0720 Merge "Don't consider the boot completed until the animation is over." into jb-mr1-dev 2012-10-10 00:35:20 -07:00
Jeff Sharkey
0fca2a3e22 Merge "Fix build, only invalidate when creating user." into jb-mr1-dev 2012-10-10 00:09:52 -07:00
Jeff Sharkey
9d0791bf6a Fix build, only invalidate when creating user. 
Bug: 7276595
Change-Id: I322f9d76a682b2d45fc556e35381442458168fe5
 2012-10-10 00:01:26 -07:00
Jeff Sharkey
c85e16cafb Merge "Make RegisteredServicesCache multi-user aware." into jb-mr1-dev 2012-10-09 23:47:01 -07:00
Satoshi Kataoka
0aaffb14c8 Merge "Don't update the text services locale in the main thread" into jb-mr1-dev 2012-10-09 23:36:50 -07:00
Yu Shan Emily Lau
d175a75d9f 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 2012-10-09 23:05:37 -07:00
Svetoslav Ganov
a726e23d7b Merge "Cannot force a shown item from an ActionMode into the overflow menu." into jb-mr1-dev 2012-10-09 22:01:55 -07:00
Jeff Sharkey
6ab72d74b8 Make RegisteredServicesCache multi-user aware. 
RegisteredServicesCache is used to track account authenticators and
sync adapters, which can vary based on user.  This change requires
that callers now provide a userId when making cache requests.  It
continues persisting into a single file for now, which is keyed based
on UID.

It now watches for package broadcasts from all users, and scans
packages on-demand.  It changes cache callers to provide a relevant
userId, and evicts cache entries when users are stopped.

Changes SyncManager to only work with accounts from running users,
only kicking off pending syncs once a user is started.

Bug: 7276595, 7316150
Change-Id: I79466a84aa69aa37e4bd9691c5d6221d3662ff29
 2012-10-09 21:39:19 -07:00
Geremy Condra
3f54274006 am c2e3be5a: Merge "DO NOT MERGE Control access to inherited methods of jsinterface objects" into jb-dev 
* commit 'c2e3be5a8bcd3be2d6cb6fda0cda28bc87d7814d':
  DO NOT MERGE Control access to inherited methods of jsinterface objects
 2012-10-09 21:37:23 -07:00
Geremy Condra
c2e3be5a8b Merge "DO NOT MERGE Control access to inherited methods of jsinterface objects" into jb-dev 2012-10-09 21:34:38 -07:00
Geremy Condra
dadea723a3 am a22000d2: Merge "DO NOT MERGE remove defunct javascript interface" into jb-dev 
* commit 'a22000d244915df2098619be5fd66bf1c4d019c8':
  DO NOT MERGE remove defunct javascript interface
 2012-10-09 21:34:33 -07:00
Geremy Condra
a22000d244 Merge "DO NOT MERGE remove defunct javascript interface" into jb-dev 2012-10-09 21:32:01 -07:00
Daniel Sandler
74526ab675 am 30417507: Merge "Fixing issue where Quick Settings user profile was not showing name or default picture. (Bug 7308719)" into jb-mr1-dev 
* commit '30417507821413bda6dc5868c68d1e9b5a7bced6':
  Fixing issue where Quick Settings user profile was not showing name or default picture. (Bug 7308719)
 2012-10-09 20:56:07 -07:00
Daniel Sandler
3041750782 Merge "Fixing issue where Quick Settings user profile was not showing name or default picture. (Bug 7308719)" into jb-mr1-dev 2012-10-09 20:53:44 -07:00
Svetoslav Ganov
14c4669916 Cannot force a shown item from an ActionMode into the overflow menu. 
1. An app showing an action mode with a visible item that decides to move this item
   to the overflow menu cannot do so since the action menu is not updated properly.
   Specifically, ActionMenuPresenter does not clear the "is action button" property
   of a menu item neither requires nor requests an action button, i.e. the item's
   "show as action" property changed to be never shown on the action bar.

bug:7319766

Change-Id: I5cfda6269466fafca1f039a3bab6397392ae9f17
 2012-10-09 19:20:27 -07:00
Baligh Uddin
07cfed1b4f am 64ad9540: Merge "Revert "Revert "Add config resource to help ATT prepaid""" into jb-mr1-dev 
* commit '64ad9540850e2ffc1583564039510592c06264f5':
  Revert "Revert "Add config resource to help ATT prepaid""
 2012-10-09 19:17:55 -07:00
Baligh Uddin
64ad954085 Merge "Revert "Revert "Add config resource to help ATT prepaid""" into jb-mr1-dev 2012-10-09 19:14:37 -07:00
Baligh Uddin
b7c6a62a09 Revert "Revert "Add config resource to help ATT prepaid"" 
Revert the revert - change is good.

This reverts commit 2133caf515660d957bb7fd05b35e7eb2f2391d48

Change-Id: I987d5533e8ce909a3adfa38bceeac5c42e22da19
 2012-10-09 19:13:31 -07:00
Dianne Hackborn
31af905ac5 am 36db9d08: Merge "Further work on issue #7307399: Framework needs a new pre-user-shutdown..." into jb-mr1-dev 
* commit '36db9d0879640a1cb9a8723d6649068a1c4c08de':
  Further work on issue #7307399: Framework needs a new pre-user-shutdown...
 2012-10-09 19:13:13 -07:00
Yu Shan Emily Lau
2ffd20753e 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.

Change-Id: Ia7425531ca2151230d7fd98eb710f282e166b4f7
 2012-10-09 19:12:46 -07:00
Dianne Hackborn
36db9d0879 Merge "Further work on issue #7307399: Framework needs a new pre-user-shutdown..." into jb-mr1-dev 2012-10-09 19:10:49 -07:00
Zhihai Xu
40874a096b Bluetooth multi-user updates: change bluetooth manager system service 
to reject background user access. disable and enable Bluetooth when user is switched

bug 6925422

Change-Id: I52136e707da2d1ba8228c1bb8beef1414ead1893
 2012-10-09 19:10:14 -07:00
Jeff Brown
20767b2d1e Don't consider the boot completed until the animation is over. 
This fixes a problem where the screen times out shortly after
boot before the user has had a chance to interact with the device.
Now we wait until the boot animation has completed then set
boot completed, poke user activity and start the countdown.

Bug: 7316397
Change-Id: Ie5a0b1012d265e655d33cc8fba49ca349f48f1de
 2012-10-09 19:06:25 -07:00
Selim Gurun
534a67c557 DO NOT MERGE Control access to inherited methods of jsinterface objects 
Bug: 7073422

Create the plumbing to use an annotation to allow access to
inherited methods of jsinterface objects. The default webview
behavior has not changed yet. However internally an a flag is
introduced to restrict javascript access to methods that have an annotation.

Clean cherry pick of 94740e6c333a109be7516abbd17dd418f23b4f0c

Provided @JavascriptInterface to methods that are accessible from
js.

Clean cherry pick of b743a23fc5bce9965c1539c3c8611614424a5aff

Add a glue logic to require use of annotations in injected accessibility
 objects.

Change-Id: I4135bd6787b2084177215302cd2c72afed090dc0
 2012-10-09 18:42:15 -07:00
Svetoslav Ganov
24169a6beb am 64182d84: Merge "Properly label RecentsActivity for accessibility. Bug: 7229886" into jb-mr1-dev 
* commit '64182d8444e5f6c9bdc25d4a7e53fd8439e2303b':
  Properly label RecentsActivity for accessibility. Bug: 7229886
 2012-10-09 18:36:28 -07:00
Svetoslav Ganov
64182d8444 Merge "Properly label RecentsActivity for accessibility. Bug: 7229886" into jb-mr1-dev 2012-10-09 18:33:31 -07:00
Dianne Hackborn
c0bd747b06 Further work on issue #7307399: Framework needs a new pre-user-shutdown... 
...phase & callback API

I realized there were a few things wrong with what was there.  The new
ACTION_USER_STARTING was not being sent for the first user at boot, and
there was an existing problem where ACTION_USER_STARTED was sent every
time there was a user switch.

Also improved some debug output of broadcasts to make it easier to see
what is going on in this stuff, and better reporting of why a service
couldn't be started.

Change-Id: Id8a536defbbad1f73d94a37d13762436b822fbe3
 2012-10-09 17:57:14 -07:00
Baligh Uddin
3decc4b597 am 2aee7c18: Merge "Revert "Add config resource to help ATT prepaid"" into jb-mr1-dev 
* commit '2aee7c1843670f5b7a81261079ad0eb1e4ebb9ef':
  Revert "Add config resource to help ATT prepaid"
 2012-10-09 17:56:45 -07:00