Mitchell Wills
722de5f9d0
DO NOT MERGE Manually merge commit 'f28778064383821ccf48c9570191f34a24aa513f' into nyc-mr1-dev-plus-aosp
...
Change-Id: I7cb1f97a5b931c2057a811d7947f47ad7320ef1c
2016-08-29 17:46:44 -07:00
The Android Automerger
f287780643
Manually merge commit 'b0b6afc' into nyc-dev-plus-aosp
2016-08-30 00:26:21 +00:00
Etan Cohen
4503dc6fba
[NAN] Provide calling package name to service
...
Useful for permission checks.
Bug: 30000323
Change-Id: I8c7f06cff346437aa24ca5da9822cbd7b20c59c4
(cherry picked from commit 7531a28e26
2016-08-29 11:26:52 -07:00
Mark Lu
b49a7f8602
docs: fix broken links in Activity reference am: fa43485910 am: 497c2907fd am: eab610d0a6
...
am: b03a1b8b25
2016-08-26 00:50:13 +00:00
Mark Lu
c4e81b64f1
docs: fix broken links in Activity reference
...
am: fa43485910
2016-08-26 00:42:01 +00:00
Mark Lu
eab610d0a6
docs: fix broken links in Activity reference am: fa43485910
...
am: 497c2907fd
2016-08-25 22:14:14 +00:00
Mark Lu
497c2907fd
docs: fix broken links in Activity reference
...
am: fa43485910
2016-08-25 21:54:49 +00:00
Andrew Scull
1aea3e73d1
Explain the IAE thrown by resetPassword. am: 60df33da54
...
am: aa96b68b66
2016-08-25 15:12:33 +00:00
Andrew Scull
aa96b68b66
Explain the IAE thrown by resetPassword.
...
am: 60df33da54
2016-08-25 15:06:33 +00:00
Andrew Scull
56bfc1cecf
Merge "Explain the IAE thrown by resetPassword." into nyc-mr1-dev
2016-08-25 15:01:18 +00:00
Jorim Jaggi
e4af99d6b7
Change retail mode wallpaper (1/2) am: 6c902d0453 am: 9d0879c6ac
...
am: 3d19454ec9
2016-08-23 16:43:54 +00:00
Jorim Jaggi
9d0879c6ac
Change retail mode wallpaper (1/2)
...
am: 6c902d0453
2016-08-23 00:17:20 +00:00
TreeHugger Robot
c7136b3b3c
Merge "Change retail mode wallpaper (1/2)" into nyc-dr1-dev
2016-08-22 22:55:15 +00:00
George Mount
c9373e5505
DO NOT MERGE ANYWHERE:Fix NPE during Activity transition using wrong Activity.
...
Bug 30786309
If the Activity used in makeSceneTransitionAnimation isn't
the same one used in the startActivity call, a NullPointerException
could be thrown.
Change-Id: Id21c54fcf99b353feab62f7fc160997ed06e7d23
(cherry picked from commit 3289bfa289a3edbf6a5d
2016-08-20 22:37:45 +00:00
Jorim Jaggi
6c902d0453
Change retail mode wallpaper (1/2)
...
Change-Id: I7ce5711e57bc39edf10fc7151f26168c6183d71e
Fixes: 30830249
2016-08-19 21:44:48 +00:00
George Mount
05051ef82b
Fix NPE during Activity transition using wrong Activity. am: a3edbf6a5d
...
am: 34abaebd3b
2016-08-18 22:37:21 +00:00
George Mount
a3edbf6a5d
Fix NPE during Activity transition using wrong Activity.
...
Bug 30786309
If the Activity used in makeSceneTransitionAnimation isn't
the same one used in the startActivity call, a NullPointerException
could be thrown.
Change-Id: Id21c54fcf99b353feab62f7fc160997ed06e7d23
(cherry picked from commit 3289bfa289
2016-08-18 17:15:43 +00:00
Mark Lu
fa43485910
docs: fix broken links in Activity reference
...
Bug: 30142414
Bug: 30837469
Change-Id: If370e49fee32df41b7dab93d6c89c79a9835dabb
2016-08-12 16:05:17 -07:00
Christopher Tate
9649aecab6
Check system & lock wallpaper backup eligibility independently am: 6172266154
...
am: 611afaf4ae
2016-08-11 20:35:43 +00:00
Christopher Tate
6172266154
Check system & lock wallpaper backup eligibility independently
...
Bug 30751829
Change-Id: Ic94689dd63238449222d1aea07231d9fd29fc76d
2016-08-11 11:22:14 -07:00
Dianne Hackborn
f83a8ffc20
A little more on issue #30766518 : Document what targeting N does am: 5f1649e852
...
am: 6ffef759da
2016-08-10 17:50:18 +00:00
Dianne Hackborn
6ffef759da
A little more on issue #30766518 : Document what targeting N does
...
am: 5f1649e852
2016-08-10 17:45:14 +00:00
Dianne Hackborn
848c690f69
Merge "A little more on issue #30766518 : Document what targeting N does" into nyc-mr1-dev
2016-08-10 17:38:02 +00:00
Adrian Roos
425ade9ef0
Notification: Reuse drawable in Header if Icon unchanged am: c4337a3569
...
am: dd33f36fc4
2016-08-10 17:12:38 +00:00
Adrian Roos
dd33f36fc4
Notification: Reuse drawable in Header if Icon unchanged
...
am: c4337a3569
2016-08-10 17:06:17 +00:00
Adrian Roos
d4a95806ab
Merge "Notification: Reuse drawable in Header if Icon unchanged" into nyc-mr1-dev
2016-08-10 16:52:15 +00:00
Dianne Hackborn
22fdbab5d0
Fix issue #30766518 : Document what targeting N does am: b34cbedb4e
...
am: 3a585b86be
2016-08-10 01:15:25 +00:00
Dianne Hackborn
5f1649e852
A little more on issue #30766518 : Document what targeting N does
...
Change-Id: I67f2bfd01261a4304b532495a0d3cc791726ed5e
2016-08-09 18:00:31 -07:00
Dianne Hackborn
3a585b86be
Fix issue #30766518 : Document what targeting N does
...
am: b34cbedb4e
2016-08-10 00:57:54 +00:00
Dianne Hackborn
75cdd5f68f
Merge "Fix issue #30766518 : Document what targeting N does" into nyc-mr1-dev
2016-08-10 00:45:55 +00:00
Hemal Patel
b4bd409237
Docs: Fixed the link that loads Fragments guide am: a8e1c75bf6 am: dabee01e9b
...
am: 3547fd0642
2016-08-09 21:19:50 +00:00
Hemal Patel
f8c0a138fb
Docs: Fixed the link that loads Fragments guide am: a8e1c75bf6
...
am: dabee01e9b
2016-08-09 21:10:40 +00:00
Hemal Patel
3547fd0642
Docs: Fixed the link that loads Fragments guide am: a8e1c75bf6
...
am: dabee01e9b
2016-08-09 21:10:34 +00:00
Dianne Hackborn
b34cbedb4e
Fix issue #30766518 : Document what targeting N does
...
Also small documentation cleanup in a few other places.
Change-Id: I16581c751aa0ffa146faba3b140a8fa2170f4520
2016-08-09 13:21:24 -07:00
Adrian Roos
c4337a3569
Notification: Reuse drawable in Header if Icon unchanged
...
Mitigates an issue where a LevelListDrawable would constantly
be reloaded even if unchanged. To avoid this, small icons are
now only reloaded if they no longer point to the same resource.
Note that StatusBarIconView already has this logic.
Change-Id: I6be436e5cef7b7ca91a28edc413b1aaa0f1007d5
Fixes: 30496073
2016-08-09 12:31:20 -07:00
Hemal Patel
a8e1c75bf6
Docs: Fixed the link that loads Fragments guide
...
In the class description, fixed the reference link that points to the
Fragments guide.
Bug: 29007808
Change-Id: I3399e5f10c461eb6666a04f8829c6cde774948e0
2016-08-08 16:43:22 -07:00
Selim Cinek
90307e081d
Fixes a bug where setting a null bigLargeIcon would not clear it am: e99acb29db
...
am: c39f8c444a
2016-08-08 19:41:16 +00:00
Selim Cinek
c39f8c444a
Fixes a bug where setting a null bigLargeIcon would not clear it
...
am: e99acb29db
2016-08-08 19:30:21 +00:00
Selim Cinek
5a3e33a82a
Merge changes Idc4c2c14,Ibea016c6,I49ab58c3,Id911d405,I0f17dc5f, ... into nyc-mr1-dev
...
* changes:
Improved the transition when clicking on the last notification
Fixed a bug that could lead to an empty notification
Removed contentDescriptions that hindered accessibility usability
Fixes a bug where setting a null bigLargeIcon would not clear it
Fixed the transition of the background of the notifications
Fixed a bug where the notification would fade out in a ugly way
2016-08-08 19:18:33 +00:00
Christopher Tate
0ddcc58272
Fix "adb backup -shared" am: 60af594c3e
...
am: f300d9760b
2016-08-05 18:16:47 +00:00
Christopher Tate
f300d9760b
Fix "adb backup -shared"
...
am: 60af594c3e
2016-08-05 18:10:33 +00:00
Chris Tate
b3690ccf2c
Merge "Fix "adb backup -shared"" into nyc-mr1-dev
2016-08-05 18:04:25 +00:00
Todd Kennedy
8c073e0aad
Move EphemeralResolverService am: 31b95e0265
...
am: fa67fad84e
2016-08-05 17:52:00 +00:00
Todd Kennedy
fa67fad84e
Move EphemeralResolverService
...
am: 31b95e0265
2016-08-05 17:47:17 +00:00
TreeHugger Robot
9d9621f472
Merge "Move EphemeralResolverService" into nyc-mr1-dev
2016-08-05 17:37:35 +00:00
Todd Kennedy
31b95e0265
Move EphemeralResolverService
...
It should not have been under com.android.internal
Fixes: 30673742
Change-Id: I2277aa4a4799fa59bf68af7c4cfcb4e1216aeb8d
2016-08-05 07:17:52 -07:00
Christopher Tate
60af594c3e
Fix "adb backup -shared"
...
An accidental side-effect of introducing the XML content file and its
domain semantic checking was that the shared-storage domain got
dropped on the floor. Now the mechanism understands what it means
again.
Bug 29999884
Change-Id: I22b99c96869683d1a92430f237dda54b170b8f60
2016-08-04 17:23:20 -07:00
Selim Cinek
e99acb29db
Fixes a bug where setting a null bigLargeIcon would not clear it
...
Because we were also looking for legacy icons and the legacy icon
was always restored for old listeners, the icon would not disappear.
Change-Id: Id911d405e5ae00bf45e34368effbf67c2425a40c
Fixes: 30663590
2016-08-04 13:04:29 -07:00
Makoto Onuki
d7f86b7115
ShortcutManager: Update foreground check. am: 33525d2f1a
...
am: 386fd915fc
2016-08-04 19:41:07 +00:00
Makoto Onuki
386fd915fc
ShortcutManager: Update foreground check.
...
am: 33525d2f1a
2016-08-04 19:35:41 +00:00
