Commit Graph

60111 Commits

Author SHA1 Message Date
Selim Cinek
7a0051b68f Merge \\"Added dismiss, expand, and collapse accessibility actions\\" into nyc-dev am: c1720dce1b
am: 0630d92064

Change-Id: I01afc02fe75b0ae7223e9deba6355ed00961faaa
2016-06-16 04:30:32 +00:00
Selim Cinek
0630d92064 Merge \"Added dismiss, expand, and collapse accessibility actions\" into nyc-dev
am: c1720dce1b

Change-Id: I25bd41f1307233bba14067952086ca7be3118505
2016-06-16 04:25:26 +00:00
TreeHugger Robot
c1720dce1b Merge "Added dismiss, expand, and collapse accessibility actions" into nyc-dev 2016-06-16 04:19:48 +00:00
Amith Yamasani
80027e9d93 Merge \\"More thorough cleansing of expired users\\" into nyc-dev am: 4f2b1b455e
am: bf1301f542

Change-Id: Ie4250ddaa0175ff25a85abdbaa59a31b61003752
2016-06-16 00:28:45 +00:00
Amith Yamasani
bf1301f542 Merge \"More thorough cleansing of expired users\" into nyc-dev
am: 4f2b1b455e

Change-Id: Ia5388c84b89cdabefe666b483cebe40066e4d26a
2016-06-16 00:24:17 +00:00
Amith Yamasani
4f2b1b455e Merge "More thorough cleansing of expired users" into nyc-dev 2016-06-16 00:14:59 +00:00
Selim Cinek
e9bad242f3 Added dismiss, expand, and collapse accessibility actions
Fixes: 20343017
Fixes: 29368014
Change-Id: Ib571242aac04c67aea2f3c3ce76139eaedc1f3f1
2016-06-15 16:30:09 -07:00
Adam Lesinski
f4152a9c7e Merge \\"ResourcesManager: Allow managed addition of library asset paths\\" into nyc-dev am: 464bda8a2b
am: c3ab1b7c0a

Change-Id: I6d268a2d0871de19a57358ff7755c525906aae1c
2016-06-15 22:57:08 +00:00
Adam Lesinski
c3ab1b7c0a Merge \"ResourcesManager: Allow managed addition of library asset paths\" into nyc-dev
am: 464bda8a2b

Change-Id: I352c56482aca030efab49ca39301679b51e44e05
2016-06-15 22:44:43 +00:00
Adam Lesinski
464bda8a2b Merge "ResourcesManager: Allow managed addition of library asset paths" into nyc-dev 2016-06-15 22:35:26 +00:00
Makoto Onuki
35f77b2b74 Merge \"ShortcutManger: Auto-adjust ranks.\" into nyc-mr1-dev
am: 70a91541e9

Change-Id: I42d2d2a954bd2f52bd7b75cfd051bab0def100da
2016-06-15 21:59:09 +00:00
Makoto Onuki
70a91541e9 Merge "ShortcutManger: Auto-adjust ranks." into nyc-mr1-dev 2016-06-15 21:44:58 +00:00
Brian Duddie
a9edc2edf2 Merge \\"Send VR mode notification to AR app on context hub\\" into nyc-dev am: 9a31e8be48
am: 93a2410f2d

Change-Id: Id041412ad3d4bb72d3284e307a9621c2db1f0e8d
2016-06-15 21:32:57 +00:00
Brian Duddie
93a2410f2d Merge \"Send VR mode notification to AR app on context hub\" into nyc-dev
am: 9a31e8be48

Change-Id: Ied704de01ddc2b9754a5a2d88b7b9624d711dd11
2016-06-15 21:28:52 +00:00
Makoto Onuki
9e1f5595bd ShortcutManger: Auto-adjust ranks.
Spec: go/shortcutmanager-spec-ranks

Bug 28984376
Bug 28536066

Change-Id: Ibffb92233c62792af06eeadc5a9a6379d0506a3c
2016-06-15 14:24:44 -07:00
Brian Duddie
5ccbc93032 Merge \"Send VR mode notification to AR app on context hub\" into nyc-dev
am: 9a31e8be48

Change-Id: I2ca21c574b86544ddf597290670ecea4a004e4d6
2016-06-15 21:19:18 +00:00
TreeHugger Robot
9a31e8be48 Merge "Send VR mode notification to AR app on context hub" into nyc-dev 2016-06-15 21:09:33 +00:00
Tianjie Xu
a92b4737c6 Merge \\"Fix a naming typo for source_build\\" into nyc-dev am: dfa654edfe
am: 5b767d1218

Change-Id: Iba0740a38e7f9fd97175542ee5255548470b510c
2016-06-15 21:04:04 +00:00
Erik Wolsheimer
4d4d4706ab Merge \"Add DENSITY_260, DENSITY_300, DENSITY_340\" into nyc-mr1-dev
am: e37ee119c2

Change-Id: Ida84134da4145843fa982abf1428790c692a24d6
2016-06-15 20:58:49 +00:00
Tianjie Xu
ab1a5e456e Merge \"Fix a naming typo for source_build\" into nyc-dev
am: dfa654edfe

Change-Id: I3eda6c97b34e6789a7450f737959fb22af9b1be4
2016-06-15 20:55:46 +00:00
Tianjie Xu
5b767d1218 Merge \"Fix a naming typo for source_build\" into nyc-dev
am: dfa654edfe

Change-Id: Ie58c4fa52cec17cec430770fec01e43a5ff5153e
2016-06-15 20:55:31 +00:00
Tianjie Xu
5fabe69fc8 Fix a naming typo for source_build
When parsing the last_install, the variable name is supposed to be
*source_build* instead of *source_version*.

Bug: 28658632
Change-Id: I1e0ed7150e04885f904b6a3efa18bd5cfe17cc96
2016-06-15 12:34:04 -07:00
Adam Lesinski
25f48886b2 ResourcesManager: Allow managed addition of library asset paths
This allows WebView to add itself to the ResourcesManager and
remain their even after configuration changes and multi-window
changes.

Bug:29112218
Change-Id: I2cb131ae2c61fb58c48babafdd46c1882be96aa9
2016-06-15 12:00:18 -07:00
Brian Duddie
c3d8a529c6 Send VR mode notification to AR app on context hub
Bug: 28793778
Change-Id: I7417ba7f696dc61689687bd56b165a81aea1715a
2016-06-15 11:36:09 -07:00
Amith Yamasani
d04aaa323c More thorough cleansing of expired users
If any /data/system_[c|d]e folders were not erased
when the user was removed (maybe due to a reboot),
make sure they're cleaned up on restart as well
as when the userId is recycled later.

Mark the users' system folders with the correct
serial number for later verification.

AccountManager shouldn't be querying accounts of
partially created/destroyed users.

Change-Id: I4313756b7464f34cd5ce4fb296d61daa50b41fcb
Fixes: 29285673
2016-06-15 11:32:16 -07:00
Erik Wolsheimer
178bba4589 Add DENSITY_260, DENSITY_300, DENSITY_340
Add supported screen densities to closer match some hardware's physical specifications

BUG: 24132725
Change-Id: I7138d92fa4e1f4320f9068e154bd8318ac0c45c7
2016-06-15 10:33:09 -07:00
Robert Carr
4bcb7f52ee Merge \\"PopupWindow: Resolve measure specs before passing to WM.\\" into nyc-dev am: 4a284be41d
am: 7b2a3cebf6

Change-Id: I7c89cc83d9a73ab8a9761a11f6f5cbb018fe1a56
2016-06-15 16:55:03 +00:00
Robert Carr
33809d724e Merge \"PopupWindow: Resolve measure specs before passing to WM.\" into nyc-dev
am: 4a284be41d

Change-Id: I3716c7a67310d3f1dea47db0da8db7915610345a
2016-06-15 16:52:07 +00:00
Robert Carr
7b2a3cebf6 Merge \"PopupWindow: Resolve measure specs before passing to WM.\" into nyc-dev
am: 4a284be41d

Change-Id: I356e7202bd8939eb5543190f17893abd43c0a0a6
2016-06-15 16:47:54 +00:00
TreeHugger Robot
4a284be41d Merge "PopupWindow: Resolve measure specs before passing to WM." into nyc-dev 2016-06-15 16:41:51 +00:00
Alex Hills
c295774697 Merge \"Adds a flag to Action.WearableExtender to display actions inline on Wear\" into nyc-mr1-dev
am: 7816efa6af

Change-Id: Idcf5a780abc93b3a7c5d3e497b98352ddc26d257
2016-06-15 16:13:52 +00:00
Alexander Hills
7816efa6af Merge "Adds a flag to Action.WearableExtender to display actions inline on Wear" into nyc-mr1-dev 2016-06-15 16:02:48 +00:00
Todd Kennedy
162b74a6fd Merge \"New API w/ multiple prefixes\" into nyc-mr1-dev
am: d07b87cb1c

Change-Id: I3296ac4343cfedb5b88470963cb4671e9e3427f6
2016-06-15 00:03:12 +00:00
Todd Kennedy
d07b87cb1c Merge "New API w/ multiple prefixes" into nyc-mr1-dev 2016-06-14 23:57:20 +00:00
Selim Cinek
b3e68016e1 Merge \\"Fixed another case where the systemUI could crashloop\\" into nyc-dev am: 02ab2f52bf
am: 91965ce2e9

Change-Id: Ia6dfb5ba27696eb4938f528a57374ae8ef0be16c
2016-06-14 23:19:50 +00:00
Selim Cinek
91965ce2e9 Merge \"Fixed another case where the systemUI could crashloop\" into nyc-dev
am: 02ab2f52bf

Change-Id: I3ca5e31a3571398d1eb00cf0c7f40d1bb007055f
2016-06-14 23:12:12 +00:00
Selim Cinek
24edc3934d Merge \"Fixed another case where the systemUI could crashloop\" into nyc-dev
am: 02ab2f52bf

Change-Id: If26ae07e20433213334233bea1231440fae817e1
2016-06-14 23:11:25 +00:00
Todd Kennedy
a97045b245 New API w/ multiple prefixes
Use the new API that contains multiple hash prefixes and a mask. Also
do some small refactoring necessary to handle multiple prefixes and
use a common implementation of the hash generation

Change-Id: Ib52f767ea6aadc30c67c5bdee949e9f9c5f04e44
2016-06-14 16:01:05 -07:00
Doris Ling
4be6c44ee2 Merge \"Added config system navigation keys.\" into nyc-mr1-dev
am: 32300db186

Change-Id: I9de582c7ae95aa36fbae75be6b72b4ffc01ae695
2016-06-14 22:39:50 +00:00
Doris Ling
32300db186 Merge "Added config system navigation keys." into nyc-mr1-dev 2016-06-14 22:35:19 +00:00
Selim Cinek
279fa867e5 Fixed another case where the systemUI could crashloop
Because it's not guaranteed to use any builder at all,
there is another case where the SmallIcon could remain null.
We are now checking this lazily instead of ahead of time.

Change-Id: I7a0feff6911b2bce6707427259d3423131a26e32
Fixes: 29255365
2016-06-14 13:02:56 -07:00
Adrian Roos
f381297dea Merge \\"Fix jittery action bar during transitions\\" into nyc-dev am: 8507d98ad1
am: 2c50962538

Change-Id: Ibb907f480b0c11839a2fc33ec95ff77b8a54b244
2016-06-14 19:53:31 +00:00
Adrian Roos
eac63514e4 Merge \\"Make RemoteView margins density-change safe\\" into nyc-dev am: 26e864c398
am: 06976edc0b

Change-Id: I2f59abdfcfd28876995b98b13ce15a40d601ca3f
2016-06-14 19:53:25 +00:00
Adrian Roos
2c50962538 Merge \"Fix jittery action bar during transitions\" into nyc-dev
am: 8507d98ad1

Change-Id: I398e98789bd7ebac32289a0a84ba9ab3393fb70e
2016-06-14 19:42:03 +00:00
Adrian Roos
06976edc0b Merge \"Make RemoteView margins density-change safe\" into nyc-dev
am: 26e864c398

Change-Id: I9fb7b321751443c750ee8acb0190a79dd8669941
2016-06-14 19:41:59 +00:00
Adrian Roos
746a64493b Merge \"Fix jittery action bar during transitions\" into nyc-dev
am: 8507d98ad1

Change-Id: I1a445bc9ce438432643f94ec912b7838b55849dd
2016-06-14 19:41:57 +00:00
Adrian Roos
ba38cc6992 Merge \"Make RemoteView margins density-change safe\" into nyc-dev
am: 26e864c398

Change-Id: I3098eb8a803de7bc471bb362a2eb01b7f6d473ce
2016-06-14 19:41:54 +00:00
Adrian Roos
8507d98ad1 Merge "Fix jittery action bar during transitions" into nyc-dev 2016-06-14 19:31:25 +00:00
Adrian Roos
26e864c398 Merge "Make RemoteView margins density-change safe" into nyc-dev 2016-06-14 19:31:14 +00:00
Makoto Onuki
df30e75294 Merge \\"Don\\'t take the DPMS lock in DPMI.createPackageSuspendedDialogIntent\\" into nyc-dev am: 5e94a16b74
am: f7c91b8838

Change-Id: Idbbc9d23187489903ecd27d3c24d688464d1273c
2016-06-14 18:32:35 +00:00