Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
158,072 Commits 3 Branches 0 Tags
72e99bb302c848bfe80a81043101992d0546d508
Commit Graph

4807 Commits

Author SHA1 Message Date
Jessica Hummel
fb97a8ed51 am 8c6d0c62: am 61896e3b: am 5a082a9e: Merge "Remove legacy version of ACTION_PROFILE_PROVISIONING_COMPLETE." into lmp-dev 
* commit '8c6d0c622c4c48676a14e97dc0e4f1431a763e29':
  Remove legacy version of ACTION_PROFILE_PROVISIONING_COMPLETE.
 2014-09-13 02:17:01 +00:00
Sander Alewijnse
923f567c85 am ae675cb2: am a0b249b2: am 4d9fe6d1: Merge "Rename email extra." into lmp-dev 
* commit 'ae675cb2a18ec63ae69bd1b69ea7b5a2f486cce0':
  Rename email extra.
 2014-09-13 02:15:59 +00:00
Alexandra Gherghina
c0f0a96ce4 am b566b869: am 92f8d577: am 443a5766: Merge "Assign default icon to users at creation time and in SystemUI." into lmp-dev 
* commit 'b566b869a88485f33f4ae1a281d3c5c0487c95d0':
  Assign default icon to users at creation time and in SystemUI.
 2014-09-13 02:15:54 +00:00
George Mount
7c736df48f am b2d22b3d: am 42e7043d: am 44673720: Merge "Fixed NPE in EnterTransitionCoordinator" into lmp-dev 
* commit 'b2d22b3dd381243a292b2f1b405ef52f35dbf4b3':
  Fixed NPE in EnterTransitionCoordinator
 2014-09-13 02:15:42 +00:00
Chris Wren
d79e4cd8c8 am 700269d6: am 04322209: am c88b35aa: Merge "remove unused matchesCallFilter(Bundle, int)" into lmp-dev 
* commit '700269d6a98920e3b7df9202b901f63852c75530':
  remove unused matchesCallFilter(Bundle, int)
 2014-09-13 02:15:34 +00:00
Christoph Studer
72b4556267 am add991ff: am fa1033fc: am e31d13ea: Merge "Notification: Reset chronometer visibility" into lmp-dev 
* commit 'add991ff3a5fd9b5ccc562441ecf437f5e2f2f1f':
  Notification: Reset chronometer visibility
 2014-09-13 02:15:26 +00:00
Jessica Hummel
ea7c1dc4a9 am 1a1b9446: am 8dd58a3e: am a387dc16: Merge "Use correct string for provisioning complete action." into lmp-dev 
* commit '1a1b94468b14a4627614cb7fb9a057076c2369bd':
  Use correct string for provisioning complete action.
 2014-09-13 02:14:54 +00:00
George Mount
bc12aa06e0 am 9c663fcf: am 9ace814b: am 3081e360: Merge "Have Activity Transitions activited by a new window attribute." into lmp-dev 
* commit '9c663fcfb9efc4313bcaf57ee52d207bd2c4ea35':
  Have Activity Transitions activited by a new window attribute.
 2014-09-12 19:23:26 +00:00
Jessica Hummel
f5f5ed7bc3 am 61896e3b: am 5a082a9e: Merge "Remove legacy version of ACTION_PROFILE_PROVISIONING_COMPLETE." into lmp-dev 
* commit '61896e3ba7c75bd062f6fa3a3ba2c2bfd7a8826f':
  Remove legacy version of ACTION_PROFILE_PROVISIONING_COMPLETE.
 2014-09-12 19:19:46 +00:00
Robin Lee
e5c0bc9530 am 7ee71d8a: am ac988bd9: am 03d82225: Merge "Add DevicePolicyManager PrivateKey mgmt" into lmp-dev 
* commit '7ee71d8a7be25bea6b66b26898945b27dffb3af6':
  Add DevicePolicyManager PrivateKey mgmt
 2014-09-12 19:19:24 +00:00
Matthew Williams
b0b0b7fd30 am f94a6a7c: am 04f538e8: am 3812a38b: Merge "Add flag to JobParameters for job expired" into lmp-dev 
* commit 'f94a6a7c55682d634b4d0f9a1184afe57d18f3c4':
  Add flag to JobParameters for job expired
 2014-09-12 19:18:50 +00:00
Sander Alewijnse
fc27bbc043 am a0b249b2: am 4d9fe6d1: Merge "Rename email extra." into lmp-dev 
* commit 'a0b249b28ea08044287a4a3558e538ab766312b3':
  Rename email extra.
 2014-09-12 19:18:48 +00:00
Alexandra Gherghina
272d79c715 am 92f8d577: am 443a5766: Merge "Assign default icon to users at creation time and in SystemUI." into lmp-dev 
* commit '92f8d577c50a54e8375435813096b997d58cd368':
  Assign default icon to users at creation time and in SystemUI.
 2014-09-12 19:18:43 +00:00
George Mount
a03396e080 am 42e7043d: am 44673720: Merge "Fixed NPE in EnterTransitionCoordinator" into lmp-dev 
* commit '42e7043d4f5c0f8daa8139ebb154c80e82dd3f54':
  Fixed NPE in EnterTransitionCoordinator
 2014-09-12 19:18:33 +00:00
Chris Wren
2ec88183e8 am 04322209: am c88b35aa: Merge "remove unused matchesCallFilter(Bundle, int)" into lmp-dev 
* commit '043222093990ee001561dc86b6850056d65dfe9b':
  remove unused matchesCallFilter(Bundle, int)
 2014-09-12 19:18:27 +00:00
Christoph Studer
9758f55262 am fa1033fc: am e31d13ea: Merge "Notification: Reset chronometer visibility" into lmp-dev 
* commit 'fa1033fc2119942ca3f8578e257ed52fee227f37':
  Notification: Reset chronometer visibility
 2014-09-12 19:18:20 +00:00
Jessica Hummel
d4463cd8bf am 8dd58a3e: am a387dc16: Merge "Use correct string for provisioning complete action." into lmp-dev 
* commit '8dd58a3e642c25cf7c2b9984fbb46c0961a0da45':
  Use correct string for provisioning complete action.
 2014-09-12 19:17:38 +00:00
Julia Reynolds
056c6d0e95 am b5f388f8: am a098030f: am 086bf8e1: Merge "Allow device owners to update LOCATION_MODE." into lmp-dev 
* commit 'b5f388f8f6b94dae5b8a4d4eb68316d52df4cdcd':
  Allow device owners to update LOCATION_MODE.
 2014-09-12 19:17:02 +00:00
Alexandra Gherghina
d681c23cd6 am dda4634d: am 04d1560c: am b04106ed: Merge "Remove package level intent forwarding." into lmp-dev 
* commit 'dda4634da53dd9732969ebf0871c9f4f3760c600':
  Remove package level intent forwarding.
 2014-09-12 19:15:56 +00:00
Jessica Hummel
b38e07572f Merge "Remove legacy version of ACTION_PROFILE_PROVISIONING_COMPLETE." into lmp-dev 2014-09-12 18:39:22 +00:00
Sander Alewijnse
098116854e Merge "Rename email extra." into lmp-dev 2014-09-12 16:14:30 +00:00
Alexandra Gherghina
3e7115ed02 Merge "Assign default icon to users at creation time and in SystemUI." into lmp-dev 2014-09-12 16:03:39 +00:00
Jessica Hummel
d8b61f62cd Remove legacy version of ACTION_PROFILE_PROVISIONING_COMPLETE. 
Change-Id: I420797291fe141e295a6197c6d453d98e679ac9e
bug: 17390600
 2014-09-12 16:25:30 +01:00
Alexandra Gherghina
64d4dca63f Assign default icon to users at creation time and in SystemUI. 
Right now different code in System UI, Settings app and other places replace the
user icon with their own default. This tries to make it consistent by moving the
mechanism used in Settings in a helper class.

Bug: 17311038
Change-Id: Ic858c65bf82a98b9806dbba029e7cdcf441f372e
 2014-09-12 15:43:42 +01:00
George Mount
2418d7381f Merge "Fixed NPE in EnterTransitionCoordinator" into lmp-dev 2014-09-12 14:09:23 +00:00
Chris Wren
135ce76a26 Merge "remove unused matchesCallFilter(Bundle, int)" into lmp-dev 2014-09-12 14:04:33 +00:00
Christoph Studer
c30afd1e74 Merge "Notification: Reset chronometer visibility" into lmp-dev 2014-09-12 13:57:37 +00:00
Sander Alewijnse
2b338a27be Rename email extra. 
Bug:17389863
Change-Id: Ie001d71e92e212b83882529ed7c93303b64277c6
 2014-09-12 12:28:40 +01:00
Jessica Hummel
d4aaab99bb Merge "Use correct string for provisioning complete action." into lmp-dev 2014-09-12 10:02:47 +00:00
Jessica Hummel
5669216e0d Use correct string for provisioning complete action. 
Change-Id: If7e0ca78a89f2cf4853ce01eb14e8a2913e3f85d
bug: 17390600
 2014-09-12 09:27:30 +00:00
George Mount
b6d4a7f141 am 9ace814b: am 3081e360: Merge "Have Activity Transitions activited by a new window attribute." into lmp-dev 
* commit '9ace814b28d582e9cd08f13919ba5b672e2b72ef':
  Have Activity Transitions activited by a new window attribute.
 2014-09-12 05:44:51 +00:00
George Mount
4188d0de10 Fixed NPE in EnterTransitionCoordinator 
Bug 17478213

Change-Id: I6614f6e9e91103fbf50c49d2560088969f90685a
 2014-09-11 17:47:11 -07:00
George Mount
9826f636ad Have Activity Transitions activited by a new window attribute. 
Bug 17006497

Window content transitions were being enabled by default in
the Material Theme so that Activity Transitions could be
enabled by default. Unfortunately, this gave the effect that
many applications did not want -- the default transition between
window content is a fade out/in. Here, a new attribute is
added: windowActivityTransitions that is enabled by default
in the Material theme and windowContentTransitions is disabled
by default in all themes.

Change-Id: Iab453d608f00a48ff7ab7f09ce84b52cf5f20294
 2014-09-11 12:23:17 -07:00
Robin Lee
ebf185a591 am ac988bd9: am 03d82225: Merge "Add DevicePolicyManager PrivateKey mgmt" into lmp-dev 
* commit 'ac988bd9e45c5588cfffc6e67d04e54b86ecd519':
  Add DevicePolicyManager PrivateKey mgmt
 2014-09-11 18:39:54 +00:00
Matthew Williams
146eccccbd am 04f538e8: am 3812a38b: Merge "Add flag to JobParameters for job expired" into lmp-dev 
* commit '04f538e80614567cb175e2021265d2b6cd727a99':
  Add flag to JobParameters for job expired
 2014-09-11 18:32:08 +00:00
Bernhard Bauer
26408ccd8e Add DevicePolicyManager PrivateKey mgmt 
Additional device policy API to install keypairs to the keychain
silently.

Bug: 15065444
Change-Id: Idc25774c9ab1a61080290bebd6f5c4f24e6ee2e0
 2014-09-11 19:17:00 +01:00
Svetoslav Ganov
24b4c4e82c am 983a6f93: am b6e7e347: am f0ccea92: Merge "Using the correct package name for ContentResolver" into lmp-dev 
* commit '983a6f9385389e7d82ee4ea1d4343b949a67849d':
  Using the correct package name for ContentResolver
 2014-09-11 17:28:05 +00:00
Matthew Williams
91911fd952 Merge "Add flag to JobParameters for job expired" into lmp-dev 2014-09-11 17:27:58 +00:00
George Mount
10dcaa134f am b13022fd: am 86d1c5d3: am 0b46b913: Merge "Fix ArrayIndexOutOfBoundsException." into lmp-dev 
* commit 'b13022fd5fc168a70cd833dc355ee7ae05938891':
  Fix ArrayIndexOutOfBoundsException.
 2014-09-11 17:25:07 +00:00
Craig Mautner
de1c660b36 am 242c891a: am 99a902ed: am cef60b6a: Merge "Wait for animation complete before completing boot" into lmp-dev 
* commit '242c891a8896977c90254a838b8f36fa165fdb6f':
  Wait for animation complete before completing boot
 2014-09-11 17:24:32 +00:00
George Mount
6381c728ae am 92eba9f0: am 7726c740: am b74b8d49: Merge "Move capturing entering views until just before transition." into lmp-dev 
* commit '92eba9f08abd508a849209c09328a3b1b3eb5c33':
  Move capturing entering views until just before transition.
 2014-09-11 17:24:04 +00:00
Julia Reynolds
3fb8348ecd am a098030f: am 086bf8e1: Merge "Allow device owners to update LOCATION_MODE." into lmp-dev 
* commit 'a098030f70a4861a4c0f7241d8a95f1d6441e5ed':
  Allow device owners to update LOCATION_MODE.
 2014-09-11 16:04:20 +00:00
Julia Reynolds
d86734b469 Merge "Allow device owners to update LOCATION_MODE." into lmp-dev 2014-09-11 15:46:07 +00:00
Alexandra Gherghina
ad8adc1b40 am 04d1560c: am b04106ed: Merge "Remove package level intent forwarding." into lmp-dev 
* commit '04d1560cac01a35776e84210b1e41038a4d7df84':
  Remove package level intent forwarding.
 2014-09-11 15:36:21 +00:00
Adam Connors
e107c3eb79 Remove package level intent forwarding. 
Clean up unused methods.

Bug: 17389110
Change-Id: I8a80fe3e14219f06572de05c390cdda0efcbf5db
 2014-09-11 15:42:13 +01:00
Jeff Davidson
9441a44c6d am e966d4d8: am 426a5429: am cfd0e5c1: Merge "Update unclear Fragment Javadoc." into lmp-dev 
* commit 'e966d4d86c140b059158504e615042daa7d8e04f':
  Update unclear Fragment Javadoc.
 2014-09-11 14:15:50 +00:00
Esteban Talavera
92f2cadf07 am bfb49179: am 52437ed7: am 55bffb50: Merge "Update string value for provisioning action and extra" into lmp-dev 
* commit 'bfb491793470f70cddcc7433a68f072a752aec41':
  Update string value for provisioning action and extra
 2014-09-11 14:14:34 +00:00
George Mount
9f874eaaaf am c58233b2: am 557b3f66: am bfbb5882: Merge "Fix fade transition not working with Activity Transitions." into lmp-dev 
* commit 'c58233b2a4c6f51eafd2be5544bbcf45faa9a7ec':
  Fix fade transition not working with Activity Transitions.
 2014-09-11 14:13:32 +00:00
Kenny Guy
fa16ba6727 am 39a0254d: am a6e2ae35: am cefee0c8: Merge "Remember userId when stripping / rebuilding notification." into lmp-dev 
* commit '39a0254dbfdd170f85602db395a5144f9dd77870':
  Remember userId when stripping / rebuilding notification.
 2014-09-11 14:12:46 +00:00
Christoph Studer
2c17ed07ec am 10afc04f: am 27674421: am c4290acf: Merge "Notification: Use ViewStub for ProgressBar" into lmp-dev 
* commit '10afc04f80b3ae27f5d56f4f7a10ffd36366b432':
  Notification: Use ViewStub for ProgressBar
 2014-09-11 14:12:36 +00:00