Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
156,350 Commits 3 Branches 0 Tags
56ec4055c4446dbce14c8dcdab54359758c882db
Commit Graph

4668 Commits

Author SHA1 Message Date
Jim Miller
260efa2fd5 am 1d7f775c: am bb9e9c7b: am 2dfada6c: Merge "Cleanup - Change name of confirm credentials method after API review" into lmp-dev 
* commit '1d7f775cca1def096906bd96f60d8767e15cbaf2':
  Cleanup - Change name of confirm credentials method after API review
 2014-09-05 22:09:47 +00:00
Jim Miller
09629ec160 am bb9e9c7b: am 2dfada6c: Merge "Cleanup - Change name of confirm credentials method after API review" into lmp-dev 
* commit 'bb9e9c7b0586dc35158529e8d10cd6b10f5e7498':
  Cleanup - Change name of confirm credentials method after API review
 2014-09-05 21:57:42 +00:00
Jim Miller
2f2ebcd688 Cleanup - Change name of confirm credentials method after API review 
Fixes bug 17288988

Change-Id: I3d69b52e7ffc9f0268fb4dc9647f8704453668b7
 2014-09-05 12:11:48 -07:00
Svetoslav
0497ebed94 am 084a748c: am 590f0f34: am b1d65d18: Merge "Fix runtime restart" into lmp-dev 
* commit '084a748cdfb8707bf5a28af4123a62a316a14ce1':
  Fix runtime restart
 2014-09-05 19:00:25 +00:00
Svetoslav
c420140874 am 590f0f34: am b1d65d18: Merge "Fix runtime restart" into lmp-dev 
* commit '590f0f345077cb40068e86db5a30185d454b7734':
  Fix runtime restart
 2014-09-05 18:48:47 +00:00
Svetoslav
7de2abb16c Fix runtime restart 
Change-Id: Ic50c8b3b06603ad517fdc8a2392ad12318d46817
 2014-09-05 11:28:00 -07:00
Svetoslav
13daae1862 am 170ace43: am 35952bf0: am 6f0cf112: Merge "Addressing API council comments for UserManager." into lmp-dev 
* commit '170ace439d91cb86f7b5b6f8129d44e2e5c40d61':
  Addressing API council comments for UserManager.
 2014-09-05 17:35:22 +00:00
Svetoslav
79391c3c5d am 35952bf0: am 6f0cf112: Merge "Addressing API council comments for UserManager." into lmp-dev 
* commit '35952bf0e8fd0ace78b015c3cde29b322cd939bb':
  Addressing API council comments for UserManager.
 2014-09-05 17:24:34 +00:00
Chris Wren
e341247c58 am a849cbc0: am 7b45868e: am b59b5205: Merge "Keep contact affinities separate across users." into lmp-dev 
* commit 'a849cbc0f870791acfd3dd3698cc81256ac1db6e':
  Keep contact affinities separate across users.
 2014-09-05 17:18:05 +00:00
Esteban Talavera
d8dd59afd8 am 07dfb259: am 4414705e: am 2c6aa357: Merge "Changed value of EXTRAs to match constant name in code." into lmp-dev 
* commit '07dfb259b5af6921ec80588df2d01f28805e8b15':
  Changed value of EXTRAs to match constant name in code.
 2014-09-05 17:17:53 +00:00
Chris Wren
b57da35784 am 7b45868e: am b59b5205: Merge "Keep contact affinities separate across users." into lmp-dev 
* commit '7b45868e6083af082c232e32f48ebf24250f317d':
  Keep contact affinities separate across users.
 2014-09-05 17:07:30 +00:00
Esteban Talavera
c8cf27016d am 4414705e: am 2c6aa357: Merge "Changed value of EXTRAs to match constant name in code." into lmp-dev 
* commit '4414705e57f8f090ccc99ca39613827d7f650612':
  Changed value of EXTRAs to match constant name in code.
 2014-09-05 17:07:19 +00:00
Svetoslav
c7d62f02b8 Addressing API council comments for UserManager. 
bug:17390424

Change-Id: I498d2541289915cb7db16e5c3249ccc7a7dc5ee6
 2014-09-05 10:07:02 -07:00
George Mount
0a6f664ff2 am b7c6a799: am 86d466b3: am b555f0cf: Merge "Fix selection of epicenter in Activity Transitions." into lmp-dev 
* commit 'b7c6a7990a59a70ab1876f7e6a1322a92fbcc4ed':
  Fix selection of epicenter in Activity Transitions.
 2014-09-05 15:55:47 +00:00
George Mount
e4bf22a740 am 6629a210: am f43c2592: am da6df616: Merge "Fix NPE when Window disappears during a transition." into lmp-dev 
* commit '6629a21012a09b30ba50446aa9fdf901d803afd9':
  Fix NPE when Window disappears during a transition.
 2014-09-05 15:55:42 +00:00
George Mount
729aa5b2b6 am a538aac4: am e389d9d0: am 47229456: Merge "API Review: Change SharedElementListener to SharedElementCallback." into lmp-dev 
* commit 'a538aac40e100719fbcfd24b87aab48e29ae31eb':
  API Review: Change SharedElementListener to SharedElementCallback.
 2014-09-05 15:55:20 +00:00
Kenny Guy
8ebc2f1a0d am b14b98f6: am cc3fa1ef: am 42484d43: Merge "Fix RemoteViews to inflate views for current user." into lmp-dev 
* commit 'b14b98f6a1828f26f23d678e43fb32d1d86eea66':
  Fix RemoteViews to inflate views for current user.
 2014-09-05 15:54:37 +00:00
Craig Mautner
f25a0c2ced am 7dfb0390: am b8479376: am d5bb6256: Merge "Update API per council request" into lmp-dev 
* commit '7dfb0390a83b79cbdc334e19f03b1da790871943':
  Update API per council request
 2014-09-05 15:33:16 +00:00
Chris Wren
c237555c6c Merge "Keep contact affinities separate across users." into lmp-dev 2014-09-05 14:58:40 +00:00
Esteban Talavera
ac15b85229 Merge "Changed value of EXTRAs to match constant name in code." into lmp-dev 2014-09-05 14:46:10 +00:00
Chris Wren
da4bd209cf Keep contact affinities separate across users. 
Also ignore people extras on USER_ALL notifications.

Bug: 16213960
Change-Id: Ic0341c88d42d4a4f12cac35c0f41c2746aec02ac
 2014-09-05 10:36:32 -04:00
Anwar Ghuloum
248b369661 Merge "Timing Hacks DO NOT MERGE" into lmp-dev 2014-09-05 14:22:51 +00:00
Anwar Ghuloum
629dc18013 Timing Hacks DO NOT MERGE 
Let's submit to see any lingering effects.

Bug: 17310019
Change-Id: I791bceec0b6aa8b80ac4e6c582a10c3f0ec7a906
 2014-09-05 07:17:39 -07:00
George Mount
ffd09aed4e Merge "Fix selection of epicenter in Activity Transitions." into lmp-dev 2014-09-05 14:14:53 +00:00
George Mount
c2d66a0282 Merge "Fix NPE when Window disappears during a transition." into lmp-dev 2014-09-05 14:14:40 +00:00
George Mount
88dcd1a5f7 Merge "API Review: Change SharedElementListener to SharedElementCallback." into lmp-dev 2014-09-05 13:55:35 +00:00
Kenny Guy
da3af8fe1b Merge "Fix RemoteViews to inflate views for current user." into lmp-dev 2014-09-05 11:19:01 +00:00
Esteban Talavera
37f0184d96 Changed value of EXTRAs to match constant name in code. 
As per API review.

Bug: 17389863
Change-Id: I85df4453d3241745b5400a6805d8c8bb4f41e92a
 2014-09-05 11:18:49 +01:00
George Mount
c6186bffe4 Fix selection of epicenter in Activity Transitions. 
Bug 17393451

Change-Id: Ibbcdc104ef3193fe8ce11fa27799801ea7e73986
 2014-09-04 16:33:59 -07:00
George Mount
6e7fb60b93 Fix NPE when Window disappears during a transition. 
Bug 17343866

Change-Id: I421a28e833ecb78cd542f3f6a728ac87b65ef832
 2014-09-04 16:20:20 -07:00
George Mount
6558056e8f API Review: Change SharedElementListener to SharedElementCallback. 
Bug 15863001
Bug 17289526

Changed SharedElementListener to SharedElementCallback
Renamed methods to use "on" prefix.
Adjusted javadoc to reflect usage in Fragments.

Change-Id: I7cc517c269a8e417cb5c3a0948bdd3b654d42472
 2014-09-04 15:05:22 -07:00
Craig Mautner
7a629c2d04 Update API per council request 
A few protected => public changes and picking up another change
in ViewAnimationUtils that got missed.

Fixes bug 17389511.

Change-Id: I75027535eade6427c2d9067369426297c168e77e
 2014-09-04 14:57:04 -07:00
David Christie
4ec0cf048a am 1fc17b58: am d3a78eff: am 36b0eac4: Merge "Add @SystemApi annotations to methods used by GmsCore. -Currently these methods are called using reflection for location. Bug: 17371392 Change-Id: I6546f5b485415beff69164ba0d526757ee831f69" into lmp-dev 
* commit '1fc17b58efa68b7128fd5b1cfa3355c353aaff4e':
  Add @SystemApi annotations to methods used by GmsCore. -Currently these methods are called using reflection for location. Bug: 17371392 Change-Id: I6546f5b485415beff69164ba0d526757ee831f69
 2014-09-04 21:29:00 +00:00
Adam Lesinski
9af8dc1e2a am f0e1995c: am 9d54107e: am 0c0fcce6: Merge "Add Configuration changes to UsageStats" into lmp-dev 
* commit 'f0e1995c81ffc925ae630987df26641330df4a38':
  Add Configuration changes to UsageStats
 2014-09-04 21:18:22 +00:00
David Christie
e7baf5afc0 Merge "Add @SystemApi annotations to methods used by GmsCore. -Currently these methods are called using reflection for location. Bug: 17371392 Change-Id: I6546f5b485415beff69164ba0d526757ee831f69" into lmp-dev 2014-09-04 20:53:39 +00:00
David Christie
c20b795cf0 Add @SystemApi annotations to methods used by GmsCore. 
-Currently these methods are called using reflection for location.
Bug: 17371392
Change-Id: I6546f5b485415beff69164ba0d526757ee831f69
 2014-09-04 20:53:21 +00:00
Adam Lesinski
430f5680b6 Merge "Add Configuration changes to UsageStats" into lmp-dev 2014-09-04 20:35:51 +00:00
Jason Monk
7a0e79850f am de6e56d8: am 2b9a1d51: am 2d084e75: Merge "Change constants from API review feedback" into lmp-dev 
* commit 'de6e56d8fda86cc0e7712e49dab370d21a3addb3':
  Change constants from API review feedback
 2014-09-04 20:11:54 +00:00
Kenny Guy
d946dfa6b0 am c9e9b3bf: am 68fc49ee: am 56e125ff: Merge "Revert "Ensure all RemoteViews use myUserId rather than context."" into lmp-dev 
* commit 'c9e9b3bfc3569260d708270aee9c49380cfb7366':
  Revert "Ensure all RemoteViews use myUserId rather than context."
 2014-09-04 19:51:13 +00:00
Jason Monk
d8927a84fb Merge "Change constants from API review feedback" into lmp-dev 2014-09-04 19:40:30 +00:00
Kenny Guy
773200640b Fix RemoteViews to inflate views for current user. 
Fix RemoteViews so that it loads resources from
user that created the RemoteViews but inflates
for the user applying the RemoteViews.
Fix Notification to rebuild RemoteViews with
same ApplicationInfo as original app.

Bug: 17302505
Change-Id: I39f21eef83d63e9e494ea35818e1eb969edd38d7
 2014-09-04 20:18:35 +01:00
Adam Lesinski
7f61e96db7 Add Configuration changes to UsageStats 
Bug:17354208
Change-Id: I9b2f595e51b656607e30e798926cfb7e25134944
 2014-09-04 12:15:32 -07:00
Kenny Guy
6e0a5aef30 Merge "Revert "Ensure all RemoteViews use myUserId rather than context."" into lmp-dev 2014-09-04 19:14:25 +00:00
Jason Monk
5503a55c0b Change constants from API review feedback 
Bug: 17390600
Change-Id: Ie93da8eb6786b7135e8b852804a95f376fcb9d91
 2014-09-04 14:25:45 -04:00
George Mount
d1b0dea1d6 am 70871f3d: am 9169d544: am ae572ad4: Merge ""Back" with translucent window now sets ActivityOptions." into lmp-dev 
* commit '70871f3d6f1e01197f7bce0490f2f188d619156c':
  "Back" with translucent window now sets ActivityOptions.
 2014-09-04 18:24:47 +00:00
Chris Wren
5f7a272e89 am 8bfe191a: am 4b6f4321: am c95be445: Merge "Honor per-app sensitivity setting." into lmp-dev 
* commit '8bfe191a93103523d57229f3d07b3a7bdb219852':
  Honor per-app sensitivity setting.
 2014-09-04 18:10:06 +00:00
George Mount
0f6c32af06 Merge ""Back" with translucent window now sets ActivityOptions." into lmp-dev 2014-09-04 18:03:52 +00:00
George Mount
9e18397112 "Back" with translucent window now sets ActivityOptions. 
Also made convertToTranslucent set the canvas opacity.

Bug 16215650

Change-Id: Id4325eaed34cda1269d874f239aeb5f6f82c959f
 2014-09-04 11:02:29 -07:00
Chris Wren
0fb810a3fa Merge "Honor per-app sensitivity setting." into lmp-dev 2014-09-04 17:42:18 +00:00
Kenny Guy
692356b7c3 Revert "Ensure all RemoteViews use myUserId rather than context." 
This reverts commit 5287e37687f117ac0b690100ad90842eff58d15a.
Reverting because only worked if settings cache had been populated
already.

Bug: 17302505
Change-Id: I4360606e9d9c6409951f0a02bd0b78c55085e0c6
 2014-09-04 18:24:31 +01:00