Victor Chang
f5b2fea636
Show a different Root CA string for device owner
...
Bug: 28627835
Change-Id: Iab750dbe7099336b664ef66892cbf2c1b89a9e8e
2016-05-09 16:41:45 +01:00
Jason Monk
fc5f0d4d20
Merge "Dashboard performance work" into nyc-dev am: 04b25af149
...
am: 96eedcfdd2
* commit '96eedcfdd24a0cda4a56843a55f448367e8518c8':
Dashboard performance work
Change-Id: Ifdb7fa74850c8a4a217ed9f706b2bc3cdcad9be4
2016-05-09 13:44:38 +00:00
Jason Monk
4a36e0b3fc
Merge "Dashboard performance work" into nyc-dev
...
am: 04b25af149
* commit '04b25af149ba8e4c38cfe17fe9caf246a598e8e3':
Dashboard performance work
Change-Id: Ib85705ab2984d6b8229181709a762dfbcf6341c0
2016-05-09 13:40:55 +00:00
Jason Monk
96eedcfdd2
Merge "Dashboard performance work" into nyc-dev
...
am: 04b25af149
* commit '04b25af149ba8e4c38cfe17fe9caf246a598e8e3':
Dashboard performance work
Change-Id: I41c9443c997428924b5ef6df2ad632c06bd416a8
2016-05-09 13:40:54 +00:00
Jason Monk
04b25af149
Merge "Dashboard performance work" into nyc-dev
2016-05-09 13:37:45 +00:00
Bill Yi
40225b58db
Import translations. DO NOT MERGE
...
Change-Id: Ia72b6a7cc7ef24d407953bdfec981ac8a08d48de
Auto-generated-cl: translation import
2016-05-09 06:29:08 -07:00
Bill Yi
bb5730df59
Import translations. DO NOT MERGE
...
Change-Id: I6e9f10288cb94440b0f46bd5405ed996168efcbf
Auto-generated-cl: translation import
2016-05-09 06:22:15 -07:00
Victor Chang
0d16f639bc
Merge "TrustCredentials listview should be expanded by default" into nyc-dev
...
am: 963c3a4e9f
* commit '963c3a4e9f06808c098fe3de4aaec5033431f21d':
TrustCredentials listview should be expanded by default
Change-Id: I4edd0c7687a8951456152f334a3a169c817f8ec1
2016-05-07 05:30:11 +00:00
Pavlin Radoslavov
3d4a586b80
resolve merge conflicts of 8fa3d44
to nyc-mr1-dev
...
Change-Id: I1eea61da6904c5d2c181962ff5bac75454d2929d
2016-05-06 18:57:18 -07:00
Jason Monk
2386dfc18d
Dashboard performance work
...
Push more stuff to backround threads (this will cause conditions/suggestions
to load slightly slower than normal content) and cache more info.
Fixes: 28613950
Bug: 28435146
Change-Id: I1080930e8f31c7f12a2d89f266bfd3236979cf40
2016-05-06 13:17:47 -04:00
Fan Zhang
789b3c9b51
Merge "Update support email/chat display string." into nyc-mr1-dev
...
am: 6d2dd23f85
* commit '6d2dd23f85006dfd32ac3e47f3a6ef8235469d17':
Update support email/chat display string.
Change-Id: Iac53a8886e5c2f8eaa7d7a00078878e240877c9a
2016-05-06 15:57:35 +00:00
Fan Zhang
6d2dd23f85
Merge "Update support email/chat display string." into nyc-mr1-dev
2016-05-06 15:45:31 +00:00
Robin Lee
084b1fc864
Merge "TrustCredentials listview should be expanded by default" into nyc-dev am: 963c3a4e9f
...
am: d48f9cf78e
* commit 'd48f9cf78e21924306855da02c71f9b65407b117':
TrustCredentials listview should be expanded by default
Change-Id: I8f746b6b53ee17362f998bde5452ff4b447de2c3
2016-05-06 15:38:39 +00:00
Victor Chang
d48f9cf78e
Merge "TrustCredentials listview should be expanded by default" into nyc-dev
...
am: 963c3a4e9f
* commit '963c3a4e9f06808c098fe3de4aaec5033431f21d':
TrustCredentials listview should be expanded by default
Change-Id: I5ac13d383e7565acade2272c805e20b67fdc856a
2016-05-06 15:33:52 +00:00
Robin Lee
963c3a4e9f
Merge "TrustCredentials listview should be expanded by default" into nyc-dev
2016-05-06 15:27:42 +00:00
Victor Chang
9583dcecce
TrustCredentials listview should be expanded by default
...
UI Change for 2-profile case:
1. When both personal and work listview are expanded, half height is allocated for each list view
2. When only one listview is expanded, full height is allocated to the list view
Video can be found at go/trust-cred-split-view
- Use 2 ListView instead of 1 ExpandableListView in order to scoll the list independently
- The ui is not changed for only one or more than 3 profiles.
- Remove TrustedCertificateAdapterCommons, and wrap GroupAdapter by ChildAdapter in order to re-use more codes
- clear mAliasLoaders in onDestroy. (Seems it's a bug.)
- When work mode or fbe locked, force to collapse work list view. User message will be prompted when user press on header
- Groups in GroupAdapter is set synchronously instead of async, since we assume the number of users are fixed during initialization
- DataSet events will go through GroupAdapter to notifiy ChildAdapter
Bug:28236955
(cherry picked from commit 7dde845544
)
Change-Id: I87293afc56e9cc270c2289111bab6f1809351faf
2016-05-06 12:55:18 +00:00
Bill Yi
fb917b0b5d
Import translations. DO NOT MERGE
...
Change-Id: Idd3405760f34528ea4561057609d438bd0871a0b
Auto-generated-cl: translation import
2016-05-05 21:41:59 -07:00
Bill Yi
8dd2b70073
Import translations. DO NOT MERGE
...
Change-Id: Iff19a526307de6bd652ba382c1914098f13583e0
Auto-generated-cl: translation import
2016-05-05 21:35:29 -07:00
pkanwar
7fe0c25f77
resolve merge conflicts of de67e0b
to nyc-mr1-dev-plus-aosp
...
Change-Id: I9213ec0dc937bd20ff705f4deb41c10a4e69c227
2016-05-05 18:53:08 -07:00
Fan Zhang
a6bd54591a
Update support email/chat display string.
...
Bug: 28141203
Also removed unnecessary padding restriction in layout so button width
can grow.
Change-Id: I2805cf161407b16544bd2dcb89d56ba8f11669b9
2016-05-05 13:55:46 -07:00
pkanwar
de67e0b0cd
The "device type" icons in "Bluetooth device list" screen are not accessible to TalkBack users.
...
am: 8fa3d44596
* commit '8fa3d44596e75cbc03f1eb5b478133360227bc66':
The "device type" icons in "Bluetooth device list" screen are not accessible to TalkBack users.
Change-Id: I7c3223eb2909f46b961c57f0321ffeb758b52547
2016-05-05 20:46:17 +00:00
Fan Zhang
e8fc10ff79
Add estimate time under support options.
...
am: be61a14fcd
* commit 'be61a14fcd01f5d8ccc2cb1584cea48b52697ce6':
Add estimate time under support options.
Change-Id: I9f175ea6e0d2b58165d4544ce8fb712695f74db0
2016-05-05 18:49:39 +00:00
pkanwar
8fa3d44596
The "device type" icons in "Bluetooth device list" screen are
...
not accessible to TalkBack users.
b/28199679 Changed method to for setting the talk-back
attribute on "device type".
Change-Id: I63820d861ea1075195b98c82004ba95470448a53
2016-05-05 11:25:46 -07:00
Rachel Zhang
bc250c382b
Merge "Launch Help & Feedback" into nyc-mr1-dev
...
am: 1529a875db
* commit '1529a875db917b4937ab37177d50e95c37b6d54c':
Launch Help & Feedback
Change-Id: If5e8c0fee1ee11968f40933eca254cada8d91189
2016-05-05 18:08:30 +00:00
Fan Zhang
be61a14fcd
Add estimate time under support options.
...
Bug: 28141203
- SupportFeatureProvider will provide a localized estimate string.
- Use a builder pattern to instantiate SupportData to avoid increasing
constructor args.
Change-Id: I92e90cd57b4ef4e1d921f403801cfd5984ef6a3b
2016-05-05 11:06:08 -07:00
Rachel Zhang
1529a875db
Merge "Launch Help & Feedback" into nyc-mr1-dev
2016-05-05 17:58:14 +00:00
Abodunrinwa Toki
8d04317a27
Merge "InputSettings: Define order of items in Physical keyboards screen." into nyc-dev am: 56f7bc44a1
...
am: a1e8cd1163
* commit 'a1e8cd1163d93f69d8d92c723afbfac631a0787e':
InputSettings: Define order of items in Physical keyboards screen.
Change-Id: I7c89dda0d0846fd316edcc92a773bfdd0e65129c
2016-05-05 16:50:32 +00:00
Abodunrinwa Toki
a1e8cd1163
Merge "InputSettings: Define order of items in Physical keyboards screen." into nyc-dev
...
am: 56f7bc44a1
* commit '56f7bc44a1d6474e1ce6b9631cdd8087f1577490':
InputSettings: Define order of items in Physical keyboards screen.
Change-Id: Ib08f573cfaee03892e6366425ed0610286ee9445
2016-05-05 16:46:48 +00:00
Abodunrinwa Toki
48bd6631af
Merge "InputSettings: Define order of items in Physical keyboards screen." into nyc-dev
...
am: 56f7bc44a1
* commit '56f7bc44a1d6474e1ce6b9631cdd8087f1577490':
InputSettings: Define order of items in Physical keyboards screen.
Change-Id: If981f9c6d29aaaaf9c1667e930a10fc1f1c82419
2016-05-05 16:46:48 +00:00
Abodunrinwa Toki
56f7bc44a1
Merge "InputSettings: Define order of items in Physical keyboards screen." into nyc-dev
2016-05-05 16:40:58 +00:00
Abodunrinwa Toki
226e452c15
InputSettings: Define order of items in Physical keyboards screen.
...
Bug: 28158120
Change-Id: Ia7cec64edb9da53a2048865e317b2b9d4b2059b0
2016-05-05 13:52:03 +01:00
Fan Zhang
aa21c1b07a
Merge "Bring escalation options UI closer to mock." into nyc-mr1-dev
...
am: 00b127b134
* commit '00b127b134ff41ea14ec56fdd33c076e1ccffc1c':
Bring escalation options UI closer to mock.
Change-Id: I4e97594c7ea9d5c70f0629fae2c0f894a3fbab08
2016-05-04 18:03:42 +00:00
Jeff Sharkey
6bb1f8146b
Merge "UX polish tweaks to FallbackHome." into nyc-dev am: e50853f485
...
am: 0d613ab2cf
* commit '0d613ab2cf31d9a6608e5cf4b7e0f5e82ae89969':
UX polish tweaks to FallbackHome.
Change-Id: Ib6ef02d4a2f073b12b4079af82569489585fab93
2016-05-04 18:00:35 +00:00
Fan Zhang
00b127b134
Merge "Bring escalation options UI closer to mock." into nyc-mr1-dev
2016-05-04 17:47:17 +00:00
Jeff Sharkey
6c2fccfabf
Merge "UX polish tweaks to FallbackHome." into nyc-dev
...
am: e50853f485
* commit 'e50853f485fd99c14d6af8167b06fc0c5ae19a22':
UX polish tweaks to FallbackHome.
Change-Id: I392867952c277fea71ab86389ed6df1e5e483b20
2016-05-04 17:34:56 +00:00
Jeff Sharkey
0d613ab2cf
Merge "UX polish tweaks to FallbackHome." into nyc-dev
...
am: e50853f485
* commit 'e50853f485fd99c14d6af8167b06fc0c5ae19a22':
UX polish tweaks to FallbackHome.
Change-Id: I9fc3f4df1333e6e17bb7aa809f2a8a822697b616
2016-05-04 17:34:55 +00:00
TreeHugger Robot
e50853f485
Merge "UX polish tweaks to FallbackHome." into nyc-dev
2016-05-04 17:13:16 +00:00
Fan Zhang
cd09151224
Bring escalation options UI closer to mock.
...
Bug: 28141203
Change-Id: Ia6d50d7d6f3010695c62fc1e8bd07f858715e455
2016-05-04 08:58:00 -07:00
Tony Mak
2211926ac4
resolve merge conflicts of d5b3a5d
to nyc-mr1-dev
...
am: 8f14564787
* commit '8f14564787da3705a895e945c72c890604d13cfd':
Add managed profile setting page
Change-Id: If1f79ebf4127aac5d8eb7b5ce74c32e3ad145121
2016-05-04 10:40:57 +00:00
Tony Mak
8f14564787
resolve merge conflicts of d5b3a5d
to nyc-mr1-dev
...
Change-Id: I1eb01bfdad24935efbbdbeaee0dcf1c374a2cadb
2016-05-04 11:14:48 +01:00
Tony Mak
b8cfa32bf1
Merge "Add managed profile setting page" into nyc-dev
...
am: d5b3a5d342
* commit 'd5b3a5d342d74411b0e4466541d5c5b1168eb803':
Add managed profile setting page
Change-Id: I1ca66552fe44e7ace9ff7b314ab0f7af53ca1e6c
2016-05-04 09:41:58 +00:00
Tony Mak
d5b3a5d342
Merge "Add managed profile setting page" into nyc-dev
2016-05-04 09:33:24 +00:00
Baligh Uddin
61e99fed5b
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 28463229
Change-Id: I7f6bb467fe967635f9febafb61764b596d075fa3
2016-05-03 17:00:33 -07:00
Jeff Sharkey
c80dc5e5ef
UX polish tweaks to FallbackHome.
...
When showing during first boot (before provisioned), render as
completely black to avoid wallpaper jank before showing SUW. Also
tweak theme used during normal (provisioned) launches to avoid
rendering the dim layer behind status bar.
Bug: 28530777
Change-Id: I4b9e6c54583f07c78d86fbe9bda7f24b6959f4ba
2016-05-03 17:25:40 -06:00
Michael Wright
8a2d933b58
Merge "Add subtext for default keyboard layout." into nyc-dev am: 12c2c2538b
...
am: df824969af
* commit 'df824969af786598f951830bd6ec387606da316a':
Add subtext for default keyboard layout.
Change-Id: I3f2802ca95c8c0b95967dd52fdc664544f6eeccf
2016-05-03 18:36:48 +00:00
Michael Wright
df824969af
Merge "Add subtext for default keyboard layout." into nyc-dev
...
am: 12c2c2538b
* commit '12c2c2538b1e87f1a2d75f001772719bca9ab8f4':
Add subtext for default keyboard layout.
Change-Id: Idd3946011f5f516c444973ce0f06381efe44cda9
2016-05-03 18:34:18 +00:00
Michael Wright
e71a6ac6cd
Merge "Add subtext for default keyboard layout." into nyc-dev
...
am: 12c2c2538b
* commit '12c2c2538b1e87f1a2d75f001772719bca9ab8f4':
Add subtext for default keyboard layout.
Change-Id: I4cfe66c6352b72e7b9baf933d9835df2a8c84282
2016-05-03 18:34:17 +00:00
Michael Wright
12c2c2538b
Merge "Add subtext for default keyboard layout." into nyc-dev
2016-05-03 18:28:59 +00:00
Michael Wright
276cc4d8ed
Add subtext for default keyboard layout.
...
Bug: 27742933
Change-Id: I51bec339c0cbcfb114f85758b6a227deb57a69e2
2016-05-03 18:27:16 +00:00
Tony Mak
64f6d9896f
Add managed profile setting page
...
Bug: 28281560
Change-Id: I1187f834dd9d002ec898a7d343198025963d1c26
2016-05-03 18:55:41 +01:00