TreeHugger Robot
58806af09c
Merge "new ClipData constructor."
2016-06-13 21:30:48 +00:00
Steve McKay
57eaaf6857
new ClipData constructor.
...
Add new constructor with args: ClipDescription, ArrayList<Item>.
This allows description and item list to be constructed separately.
Change-Id: I09f63d308dbafdb2c749019848afb0d2d24b8c44
2016-06-13 12:54:14 -07:00
Andreas Gampe
3196999a50
Merge \\"Otadexopt: Expose progress percentage\\" into nyc-mr1-dev am: b71c36b000
...
am: cda39b3af7
2016-06-13 17:02:11 +00:00
Andreas Gampe
cda39b3af7
Merge \"Otadexopt: Expose progress percentage\" into nyc-mr1-dev
...
am: b71c36b000
2016-06-13 16:58:06 +00:00
TreeHugger Robot
b71c36b000
Merge "Otadexopt: Expose progress percentage" into nyc-mr1-dev
2016-06-13 16:52:18 +00:00
Makoto Onuki
8aabf5e997
Merge \\"Fix some exception messages and enhance unit tets\\" into nyc-mr1-dev am: 5b8f5fd38b
...
am: 1c14929ae8
2016-06-13 16:46:24 +00:00
Makoto Onuki
1c14929ae8
Merge \"Fix some exception messages and enhance unit tets\" into nyc-mr1-dev
...
am: 5b8f5fd38b
2016-06-13 16:39:46 +00:00
Makoto Onuki
5b8f5fd38b
Merge "Fix some exception messages and enhance unit tets" into nyc-mr1-dev
2016-06-13 16:28:32 +00:00
Makoto Onuki
a1d38b3c95
Fix some exception messages and enhance unit tets
...
Bug 29275393
Change-Id: Idaa8564d41f86de2a2cbefa4ff3c08b89a3a6dd2
2016-06-10 15:32:26 -07:00
Andreas Gampe
bf06232f4d
Otadexopt: Expose progress percentage
...
To be able to report progress of an A/B OTA dexopt, expose a
progress function that the script can query.
Bug: 25612095
Bug: 29223204
Change-Id: Ie8162946d18f6fa78649a40ad5d3949d31a181cd
2016-06-10 15:21:39 -07:00
Todd Kennedy
a62547849d
Merge \\"fix prefix generation\\" into nyc-mr1-dev am: 0f8427773e
...
am: db6cd50708
2016-06-10 16:12:22 +00:00
Todd Kennedy
db6cd50708
Merge \"fix prefix generation\" into nyc-mr1-dev
...
am: 0f8427773e
2016-06-10 16:08:47 +00:00
Keisuke Kuroyanagi
3c91c40769
Merge "Fix: UndoManager#saveInstanceState."
2016-06-10 06:08:18 +00:00
Todd Kennedy
e2e1ef0581
fix prefix generation
...
when performing bitwise operations, java promotes byte's to int's.
this is normally okay except when the value is negative. in that
case, java extends the sign bits. this means that after shifting,
all of the upper bits are most likely going to be all f's. instead,
undo the sign extension by pulling out just the 8 bits we're
interested in.
Change-Id: I89f7244f6b675be2cca4a185a7002b5f8a6eece1
2016-06-09 15:22:15 -07:00
Todd Kennedy
a3d4c84311
Merge \\"make round icon usage configurable\\" into nyc-mr1-dev am: 7b52b2eccd
...
am: ca251e5325
2016-06-09 17:24:29 +00:00
Todd Kennedy
ca251e5325
Merge \"make round icon usage configurable\" into nyc-mr1-dev
...
am: 7b52b2eccd
2016-06-09 17:13:28 +00:00
Todd Kennedy
a83bfca63f
make round icon usage configurable
...
We want to only use round icons for Nexus devices, so, add a configuration
boolean to control it. By default we will use the legacy, rectangle icons.
Bug: 28981414
Change-Id: Ib6448bc09287de852a48a943461a6882bd890a30
2016-06-09 07:25:03 -07:00
fionaxu
4258617146
Merge \\\"resolve merge conflicts of afed6f8 to nyc-dev\\\" into nyc-dev am: 0c4f1c7e5c am: bee500e374
...
am: e9819bae1a
2016-06-09 02:57:42 +00:00
Chen Xu
e9819bae1a
Merge \\"resolve merge conflicts of afed6f8 to nyc-dev\\" into nyc-dev am: 0c4f1c7e5c
...
am: bee500e374
2016-06-09 02:47:10 +00:00
fionaxu
e285ab3aae
Merge \"resolve merge conflicts of afed6f8 to nyc-dev\" into nyc-dev
...
am: 0c4f1c7e5c
2016-06-09 02:39:54 +00:00
fionaxu
bee500e374
Merge \"resolve merge conflicts of afed6f8 to nyc-dev\" into nyc-dev
...
am: 0c4f1c7e5c
2016-06-09 02:39:52 +00:00
fionaxu
7978147771
resolve merge conflicts of afed6f8 to nyc-dev
...
Bug: 28557603
Change-Id: Icb19f3d031cce2d846d5f6e9ad4d28d002db6bac
2016-06-08 17:23:09 -07:00
Alan Viverette
7fa09ec4dc
Merge \"Return correct default theme on API >= 24\" into nyc-dev
...
am: afaa1e9db1
2016-06-08 20:20:44 +00:00
Alan Viverette
8042dd846a
Merge \\\"Return correct default theme on API >= 24\\\" into nyc-dev am: afaa1e9db1 am: 1bb283131f
...
am: af2f098c8c
2016-06-08 19:03:43 +00:00
Ian Pedowitz
af2f098c8c
Merge \\"Return correct default theme on API >= 24\\" into nyc-dev am: afaa1e9db1
...
am: 1bb283131f
2016-06-08 18:59:14 +00:00
Alan Viverette
1bb283131f
Merge \"Return correct default theme on API >= 24\" into nyc-dev
...
am: afaa1e9db1
2016-06-08 18:35:22 +00:00
fionaxu
c10e4fae05
resolve merge conflicts of 2c53526 to lmp-mr1-dev am: c196526f8e am: 1e8fe12f4e am: 965084dd0c am: 698e044717
...
am: c95d552de0
2016-06-08 18:11:09 +00:00
Makoto Onuki
c4e64bc449
Merge \\"ShortcutManager: deal with changing resource IDs on app update\\" into nyc-mr1-dev am: 3bb4366006
...
am: a3a56ab9d1
2016-06-08 17:23:34 +00:00
fionaxu
c95d552de0
resolve merge conflicts of 2c53526 to lmp-mr1-dev am: c196526f8e am: 1e8fe12f4e am: 965084dd0c
...
am: 698e044717
2016-06-08 17:23:27 +00:00
Makoto Onuki
a3a56ab9d1
Merge \"ShortcutManager: deal with changing resource IDs on app update\" into nyc-mr1-dev
...
am: 3bb4366006
2016-06-08 17:11:55 +00:00
fionaxu
698e044717
resolve merge conflicts of 2c53526 to lmp-mr1-dev am: c196526f8e am: 1e8fe12f4e
...
am: 965084dd0c
2016-06-08 17:11:49 +00:00
fionaxu
965084dd0c
resolve merge conflicts of 2c53526 to lmp-mr1-dev am: c196526f8e
...
am: 1e8fe12f4e
2016-06-08 17:04:09 +00:00
Alan Viverette
4b2b615669
Return correct default theme on API >= 24
...
This method was broken, but it was returning light theme on N preview
builds, so we'll keep it consistent as we move into N release.
Bug: 29192690
Change-Id: I0d16abbe48756070dcd653c39d0da4124ea66b28
2016-06-08 11:45:15 -04:00
fionaxu
c196526f8e
resolve merge conflicts of 2c53526 to lmp-mr1-dev
...
Change-Id: I4fe45fae0a98934ac9b0f6f48c8cab8546392641
2016-06-07 22:01:19 -07:00
fionaxu
2c53526b4b
Backport loadSafeLabel changes am: be2865a60a am: 4c50846519
...
am: 9a825b0fd5
2016-06-07 23:23:10 +00:00
fionaxu
9a825b0fd5
Backport loadSafeLabel changes am: be2865a60a
...
am: 4c50846519
2016-06-07 23:20:04 +00:00
fionaxu
4c50846519
Backport loadSafeLabel changes
...
am: be2865a60a
2016-06-07 23:13:08 +00:00
Makoto Onuki
157b1628fd
ShortcutManager: deal with changing resource IDs on app update
...
- When an app is upgraded, all the resource IDs may change. So
if a shortcut is previously published with an icon for res ID 100
and the publisher is upgraded, resource #100 may refer to something
different.
- So now the service also remembers resource names for icon resources,
as wells as string resources. When an app is updated, the service
fetch the updated resource IDs by name.
- Also extract all string resources when a shortcut is published
and persist them, so that even when the original string resources are
removed from the app, the launcher can still show the extracted strings.
- When the system locale changes, re-extract all string resources.
- Also really hide the constants in ShortcutInfo that were
accidentally made public.
Change-Id: I23c29b45c1de5d76175229190a1533c9c62c5960
2016-06-07 16:11:30 -07:00
fionaxu
be2865a60a
Backport loadSafeLabel changes
...
Bug:23531798
Bug:28557603
Change-Id: Iee49f7c37d6a42fe74077bb15ed47919d351d172
2016-06-07 22:51:28 +00:00
Keisuke Kuroyanagi
973edd1081
Fix: UndoManager#saveInstanceState.
...
The number of redo states was stored to Parcel in saveInstanceState;
however, there wasn't corresponding read in restoreInstanceState.
Bug: 29113655
Change-Id: I95298f43dd206e0318a80f1643d2129d1199cc9e
2016-06-07 08:27:50 +00:00
Makoto Onuki
cffb6041d2
Merge "ShortcutManager: Implement usage report API" into nyc-mr1-dev am: 37087ad710
...
am: 51c7ce7531
2016-06-03 15:44:53 +00:00
Makoto Onuki
51c7ce7531
Merge "ShortcutManager: Implement usage report API" into nyc-mr1-dev
...
am: 37087ad710
2016-06-03 15:37:10 +00:00
Makoto Onuki
37087ad710
Merge "ShortcutManager: Implement usage report API" into nyc-mr1-dev
2016-06-03 15:21:45 +00:00
Todd Kennedy
d2bbc1e2a0
Merge "Round icons" into nyc-mr1-dev am: 7d64d64269
...
am: a84b5d0ebd
2016-06-03 00:44:54 +00:00
Todd Kennedy
a84b5d0ebd
Merge "Round icons" into nyc-mr1-dev
...
am: 7d64d64269
2016-06-03 00:38:26 +00:00
Todd Kennedy
bb8a42da70
Round icons
...
Allow applications to specify "android:roundIcon" in all places
they can already specify the rectangular "android:icon".
Bug: 28981414
Change-Id: I167163d650db80f4949274d365e7fee9aceacb3a
2016-06-02 15:57:54 -07:00
Makoto Onuki
ac042501c8
ShortcutManager: Implement usage report API
...
Bug 28536054
Change-Id: I293e8eaad523e3b0d76d562fc381601633451ed3
2016-06-02 15:57:40 -07:00
Makoto Onuki
9a968df828
Merge "ShortcutManager: API rename" into nyc-mr1-dev am: 60585d12e7
...
am: facbcba617
2016-06-02 00:50:25 +00:00
David Sehr
f8b6855dca
Merge "Merge "Installer connection support for dump_profiles" into nyc-dev am: 7c5bcfc21a am: fc536cb862" into nyc-mr1-dev-plus-aosp
...
am: ad63ea9962
2016-06-02 00:30:22 +00:00
Jeff Sharkey
0e1a527c64
Merge "Merge "Release AssetManagers when ejecting storage." into nyc-dev am: 380f3b12a4 am: 20340d0fc8" into nyc-mr1-dev-plus-aosp
...
am: d73289e7ac
2016-06-02 00:30:18 +00:00
