Selim Cinek
78f6971660
Merge changes I8c1cd4d4,I5ed13c17,If603049c,I5cb7937c into nyc-dev am: 00e61f5a64
...
am: 00fdea7e14
* commit '00fdea7e14841c516dea884cd28bb5cfa0272c9d':
Fixed a bug where text would still not animate
Reseting user expansions when the shade is collapsed
Added more spacing around notifications
Fixed an bug with the notification backgrounds
2016-03-11 02:30:41 +00:00
Selim Cinek
00fdea7e14
Merge changes I8c1cd4d4,I5ed13c17,If603049c,I5cb7937c into nyc-dev
...
am: 00e61f5a64
* commit '00e61f5a6455ba0ae90859acdd76e54efc849c3c':
Fixed a bug where text would still not animate
Reseting user expansions when the shade is collapsed
Added more spacing around notifications
Fixed an bug with the notification backgrounds
2016-03-11 02:27:55 +00:00
Selim Cinek
00e61f5a64
Merge changes I8c1cd4d4,I5ed13c17,If603049c,I5cb7937c into nyc-dev
...
* changes:
Fixed a bug where text would still not animate
Reseting user expansions when the shade is collapsed
Added more spacing around notifications
Fixed an bug with the notification backgrounds
2016-03-11 02:20:15 +00:00
Adam Lesinski
5199141263
Merge "Cache per-Activity Resources objects" into nyc-dev am: 58f1018c56
...
am: 3283e02a45
* commit '3283e02a45431d92689e92ba683a05b4fc457541':
Cache per-Activity Resources objects
2016-03-10 20:56:36 +00:00
Adam Lesinski
3283e02a45
Merge "Cache per-Activity Resources objects" into nyc-dev
...
am: 58f1018c56
* commit '58f1018c56a88e7864c7ff85f5b85129e790ffd2':
Cache per-Activity Resources objects
2016-03-10 20:53:54 +00:00
Adam Lesinski
58f1018c56
Merge "Cache per-Activity Resources objects" into nyc-dev
2016-03-10 20:50:40 +00:00
Adam Lesinski
082614c6a5
Cache per-Activity Resources objects
...
Each Activity has a Resources object whose underlying state changes
when a configuration change occurs, both global and for that activity only (multi-window).
Views and other clients of the Resources object can safely cache it knowing that
they always have a reference to the most up-to-date resources.
This applies to Resources.Theme objects as well.
Bug:26854894
Change-Id: Ifd3da5a1086e17f747dfc265a447fe92a3a5c692
2016-03-10 11:30:18 -08:00
Kenny Guy
25ed2ead62
Merge "Update docs to make suspend then uninstall clear." into nyc-dev am: ab750d283a
...
am: fd1ce2b9e2
* commit 'fd1ce2b9e27eec3b1b017ab23cd08729d4cc2063':
Update docs to make suspend then uninstall clear.
2016-03-10 19:26:08 +00:00
Kenny Guy
fd1ce2b9e2
Merge "Update docs to make suspend then uninstall clear." into nyc-dev
...
am: ab750d283a
* commit 'ab750d283aca3dcfa8178589ca64e8be819f848b':
Update docs to make suspend then uninstall clear.
2016-03-10 19:23:42 +00:00
Kenny Guy
ab750d283a
Merge "Update docs to make suspend then uninstall clear." into nyc-dev
2016-03-10 19:19:08 +00:00
Christopher Tate
f1dd9d9e2f
Merge "Improve AlarmManager docs" into nyc-dev am: 4206bde4d7
...
am: c097e6eb93
* commit 'c097e6eb9379f32d850c941ea44fad7a0a05b9c8':
Improve AlarmManager docs
2016-03-10 18:03:57 +00:00
Christopher Tate
c097e6eb93
Merge "Improve AlarmManager docs" into nyc-dev
...
am: 4206bde4d7
* commit '4206bde4d731a0633f7a4ef778f4d92a4b1adb4a':
Improve AlarmManager docs
2016-03-10 18:01:52 +00:00
Kenny Guy
871f3ebb56
Update docs to make suspend then uninstall clear.
...
Update docs to say suspending then unintalling an
app unsuspends the app. Point out admin can block
uninstall if they want.
Bug: 26935242
Change-Id: I4390fa20c9d8954b36ff80fc449b62891eee598c
2016-03-10 14:04:43 +00:00
Selim Cinek
c0fac72d3c
Added more spacing around notifications
...
The notification spacings were increased and
slightly adapted to spec to improve the
layout hierarchy.
Bug: 27431551
Change-Id: If603049c38b0f101c8e64813d9e5797c34aade0e
2016-03-09 20:13:12 -08:00
Christopher Tate
2affae90b8
Improve AlarmManager docs
...
In particular, add some missing information about what
getNextAlarmClock() returns.
Bug 27562400
Change-Id: I8c76b0c4208082d4da8ea490518e023584da6440
2016-03-09 17:56:32 -08:00
Joe Onorato
ca3cbc1d63
Merge "Add an API for apps to get their System Health / Battery Stats data." into nyc-dev am: 04a72a2a51
...
am: af2d5fb699
* commit 'af2d5fb699e18378190139411c87046fa07be092':
Add an API for apps to get their System Health / Battery Stats data.
2016-03-10 01:02:12 +00:00
Joe Onorato
af2d5fb699
Merge "Add an API for apps to get their System Health / Battery Stats data." into nyc-dev
...
am: 04a72a2a51
* commit '04a72a2a51ce3d128959b2ba53b5c22576322e59':
Add an API for apps to get their System Health / Battery Stats data.
2016-03-10 00:58:30 +00:00
Joe Onorato
04a72a2a51
Merge "Add an API for apps to get their System Health / Battery Stats data." into nyc-dev
2016-03-10 00:52:03 +00:00
Vadim Tryshev
aa0dfc8c41
Merge "Fixing bugs with peeking a wallpaper." into nyc-dev am: 4eeb7e2cae
...
am: ed633e97e3
* commit 'ed633e97e35fd8d04a1e0bec812db08b002b30b2':
Fixing bugs with peeking a wallpaper.
2016-03-09 23:52:35 +00:00
Vadim Tryshev
ed633e97e3
Merge "Fixing bugs with peeking a wallpaper." into nyc-dev
...
am: 4eeb7e2cae
* commit '4eeb7e2cae3d7cae43a35a6cc43b03ab923937bd':
Fixing bugs with peeking a wallpaper.
2016-03-09 23:50:35 +00:00
Joe Onorato
713fec85b8
Add an API for apps to get their System Health / Battery Stats data.
...
Change-Id: Ib27e1be469b826f6d83d73ce6024102bbdb1d47a
2016-03-09 15:47:24 -08:00
Vadim Tryshev
4eeb7e2cae
Merge "Fixing bugs with peeking a wallpaper." into nyc-dev
2016-03-09 23:44:23 +00:00
Jeff Sharkey
5b416edcff
Merge "Log when pre-N apps send too much to DropBox." into nyc-dev am: 93720d5729
...
am: 7051cad205
* commit '7051cad205e3ea3269c51811f5586e165d533af0':
Log when pre-N apps send too much to DropBox.
2016-03-09 23:39:22 +00:00
Jeff Sharkey
7051cad205
Merge "Log when pre-N apps send too much to DropBox." into nyc-dev
...
am: 93720d5729
* commit '93720d572971115b4968acc8f64529b5698bfd11':
Log when pre-N apps send too much to DropBox.
2016-03-09 23:37:21 +00:00
Jeff Sharkey
93720d5729
Merge "Log when pre-N apps send too much to DropBox." into nyc-dev
2016-03-09 23:31:01 +00:00
Jeff Sharkey
b8e8a91f54
Log when pre-N apps send too much to DropBox.
...
Once they target N, they'll start getting exceptions, which is
intended to make sure they pay attention to data that would have
otherwise been dropped on the floor.
Bug: 27571535
Change-Id: I49163679c629cd0788327d2c3a654e757ecdcb99
2016-03-09 16:27:42 -07:00
Makoto Onuki
108853ba12
Merge "ShortcutManager: add remaining APIs." into nyc-dev am: 4a07c34ca8
...
am: 027fd0ae95
* commit '027fd0ae9512b57ec13448d292609ad41ebd0bb6':
ShortcutManager: add remaining APIs.
2016-03-09 22:35:38 +00:00
Makoto Onuki
027fd0ae95
Merge "ShortcutManager: add remaining APIs." into nyc-dev
...
am: 4a07c34ca8
* commit '4a07c34ca86fddb75332eba22a4d7b9bd48205db':
ShortcutManager: add remaining APIs.
2016-03-09 22:33:35 +00:00
Makoto Onuki
4a07c34ca8
Merge "ShortcutManager: add remaining APIs." into nyc-dev
2016-03-09 22:28:45 +00:00
Suprabh Shukla
6a643dbee7
Merge "Calling method in DPMS after resolving userId" into nyc-dev am: d7924b6063
...
am: 06a3c6d32c
* commit '06a3c6d32c0c70457c7eb5eccf3395e867fb3b61':
Calling method in DPMS after resolving userId
2016-03-09 22:02:22 +00:00
Suprabh Shukla
06a3c6d32c
Merge "Calling method in DPMS after resolving userId" into nyc-dev
...
am: d7924b6063
* commit 'd7924b60635d62f2df888b53dc3ef27d9947133c':
Calling method in DPMS after resolving userId
2016-03-09 21:58:10 +00:00
Suprabh Shukla
d7924b6063
Merge "Calling method in DPMS after resolving userId" into nyc-dev
2016-03-09 21:50:44 +00:00
Suprabh Shukla
8bea73e5c1
Calling method in DPMS after resolving userId
...
ActivityManagerService was calling
hasDeviceOwnerOrProfileOwner in DevicePolicyManagerService.LocalService
before resolving negative userIds to a real user. Moved the call to a point
when userId is already resolved.
bug: b/27538249
Change-Id: I760412978b3260523e9abcfe59d8e100ec4af12f
2016-03-09 13:38:15 -08:00
Vadim Tryshev
93a914a77f
Fixing bugs with peeking a wallpaper.
...
1. Cached wallpaper from one user could be retrieved
for another user. Fixed with adding a mCachedWallpaperUserId
member.
2. mDefault wallpaper was returned too early. Moved down
so that default wallpaper could be returned only after
making sure that system wallpaper is unspecified.
Bug: 25185253
Change-Id: Ie620621e5c4039d5d680211150aa5327f321f11a
2016-03-09 20:36:01 +00:00
Chris Wren
52165a7ab0
Merge "add a ranking service to the rocket" into nyc-dev am: a82662e3f5
...
am: 2be6b136a8
* commit '2be6b136a8d0f5de12a8e1f5a3c17c8b4fe27cf1':
add a ranking service to the rocket
2016-03-09 16:52:05 +00:00
Chris Wren
2be6b136a8
Merge "add a ranking service to the rocket" into nyc-dev
...
am: a82662e3f5
* commit 'a82662e3f5d6a36df9d5c0d33d5847d08273bd93':
add a ranking service to the rocket
2016-03-09 16:47:46 +00:00
Alan Viverette
c6dfb332ba
Merge "Set DatePickerListener last during DatePickerDialog construction" into nyc-dev am: 2c18cd0823
...
am: 669b25d58e
* commit '669b25d58e6b8840f39c95f76c79ab90c46e27e7':
Set DatePickerListener last during DatePickerDialog construction
2016-03-09 16:31:06 +00:00
Robin Lee
4a23e41cb4
Merge "Corrections to javadoc for install & removeKeyPair" into nyc-dev am: 9acee934de
...
am: c3152fe087
* commit 'c3152fe08749c12f017598a37e65277c180f05b6':
Corrections to javadoc for install & removeKeyPair
2016-03-09 16:31:05 +00:00
Alan Viverette
669b25d58e
Merge "Set DatePickerListener last during DatePickerDialog construction" into nyc-dev
...
am: 2c18cd0823
* commit '2c18cd082359533d326081756b4fd2df2164a253':
Set DatePickerListener last during DatePickerDialog construction
2016-03-09 16:28:52 +00:00
Robin Lee
c3152fe087
Merge "Corrections to javadoc for install & removeKeyPair" into nyc-dev
...
am: 9acee934de
* commit '9acee934de1f2242f29a57a854df837e8f38fa04':
Corrections to javadoc for install & removeKeyPair
2016-03-09 16:28:51 +00:00
Chris Wren
a82662e3f5
Merge "add a ranking service to the rocket" into nyc-dev
2016-03-09 16:26:56 +00:00
Alan Viverette
2c18cd0823
Merge "Set DatePickerListener last during DatePickerDialog construction" into nyc-dev
2016-03-09 15:52:35 +00:00
Robin Lee
9acee934de
Merge "Corrections to javadoc for install & removeKeyPair" into nyc-dev
2016-03-09 15:48:25 +00:00
Robin Lee
a1b290e11a
Corrections to javadoc for install & removeKeyPair
...
Making these more consistent - refer to 'certificate and private key
pair' in titles instead of 'credentials'. It is still used in one place
where 'credentials' makes sense.
Bug: 27533004
Change-Id: Ied80017c6f391646b10921b011be35eea113373f
2016-03-09 14:38:36 +00:00
Makoto Onuki
5504622fb0
ShortcutManager: add remaining APIs.
...
- Icons are now persisted. (under /data/system_ce, as PNGs)
- the "load icon" APIs in LauncherApps are supported.
- Implement updateShortcuts()
- Addressed all the comments on the previous CL
- @hide the newly added constructor for PersistableBundle
- Enhance incoming shortcut validation
- A lot of internal clean-up.
Bug 27548047
Change-Id: I8e3c1ccd3e0a997a6d271c84d81170f0c022b60e
2016-03-08 18:37:32 -08:00
Sudheer Shanka
80e6e6332b
Merge "Update DPM.getWifiMacAddress to take admin component as argument." into nyc-dev am: 97e89c624e
...
am: 6f0d578ea9
* commit '6f0d578ea97454e550586f58279bf868f24a2d53':
Update DPM.getWifiMacAddress to take admin component as argument.
2016-03-08 23:49:35 +00:00
Alan Viverette
4d1ad994d3
Set DatePickerListener last during DatePickerDialog construction
...
Prevents us from calling the listener before we're fully set up.
Bug: 27475444
Change-Id: I0def384b60c09c44d36e60503ddb8434055dfb6f
2016-03-08 18:48:47 -05:00
Sudheer Shanka
6f0d578ea9
Merge "Update DPM.getWifiMacAddress to take admin component as argument." into nyc-dev
...
am: 97e89c624e
* commit '97e89c624e19c0a0ebe3d76506a493cfe29c0558':
Update DPM.getWifiMacAddress to take admin component as argument.
2016-03-08 23:09:23 +00:00
Sudheer Shanka
97e89c624e
Merge "Update DPM.getWifiMacAddress to take admin component as argument." into nyc-dev
2016-03-08 22:52:11 +00:00
Selim Cinek
5473760ae0
Merge "Fixed a bug where the font sizes where not enforced correctly" into nyc-dev am: c5ce69f555
...
am: 47bc04b0b0
* commit '47bc04b0b0403491fa64ec40d47d669be26bc428':
Fixed a bug where the font sizes where not enforced correctly
2016-03-08 22:47:06 +00:00