Victor Chang
9aa5ee31e0
Merge "TrustCredentials listview should be expanded by default"
2016-05-06 03:08:22 +00:00
pkanwar
38b59119ab
resolve merge conflicts of de67e0b to nyc-mr1-dev-plus-aosp
...
am: 7fe0c25f77
* commit '7fe0c25f77e30c63eb486ae340ff8b1ce82c190c':
The "device type" icons in "Bluetooth device list" screen are not accessible to TalkBack users.
Change-Id: I0f4c21c20d921d9f239b6a4aa3352d9fb76280c8
2016-05-06 02:05:43 +00: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
08a6d43a31
Add estimate time under support options. am: be61a14fcd
...
am: e8fc10ff79
* commit 'e8fc10ff79a19aa8b7c303740ab4a26abd9db753':
Add estimate time under support options.
Change-Id: Ifd226f015b01cc5cb2537a7bac01231fa970ac09
2016-05-05 18:54:01 +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
94a16c9d10
Merge "Launch Help & Feedback" into nyc-mr1-dev am: 1529a875db
...
am: bc250c382b
* commit 'bc250c382bbadf36fe20fa819d9722296fb08064':
Launch Help & Feedback
Change-Id: I568359105877d0b846874fb20fe7a763a124cac5
2016-05-05 18:13:20 +00: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
b6a7facc1a
Merge "InputSettings: Define order of items in Physical keyboards screen." into nyc-dev am: 56f7bc44a1 am: a1e8cd1163
...
am: 8d04317a27
* commit '8d04317a2751f32929b978ff194042172b9b2e62':
InputSettings: Define order of items in Physical keyboards screen.
Change-Id: I1308a8fa4cdf7e698d42c10a9d5a2aa92ffa9d4c
2016-05-05 16:56:05 +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
Victor Chang
7dde845544
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
Change-Id: Iebfcd3fcb6515b42687e133b11696c42db63d18f
2016-05-05 08:58:50 +01:00
Fan Zhang
1eef5f9445
Merge "Bring escalation options UI closer to mock." into nyc-mr1-dev am: 00b127b134
...
am: aa21c1b07a
* commit 'aa21c1b07af088ac1d106ebad91016dd1fcc29ca':
Bring escalation options UI closer to mock.
Change-Id: I7519fa058e1be86af37527e8c1ff9c4476120f6d
2016-05-04 18:45:59 +00:00
Jeff Sharkey
cd012ff953
Merge "UX polish tweaks to FallbackHome." into nyc-dev am: e50853f485 am: 0d613ab2cf
...
am: 6bb1f8146b
* commit '6bb1f8146b048110be3e25fdafe2d8045abaaae6':
UX polish tweaks to FallbackHome.
Change-Id: I882caf4bc033a801936fa4321a99360b26abc29d
2016-05-04 18:44:54 +00: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
b38b537983
resolve merge conflicts of d5b3a5d to nyc-mr1-dev am: 8f14564787
...
am: 2211926ac4
* commit '2211926ac4c24fcdfc635d58dc8c2dd2ec029d1c':
Add managed profile setting page
Change-Id: I16a93e4527468de9005db3adfa598a924a3efa19
2016-05-04 10:46:45 +00: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
9d95f44205
Merge "Add subtext for default keyboard layout." into nyc-dev am: 12c2c2538b am: df824969af
...
am: 8a2d933b58
* commit '8a2d933b58f60d7c295428c162057a09abe6e7de':
Add subtext for default keyboard layout.
Change-Id: I7056e5bf83b5e3140df45c4d8b6b4b9cf0eedcc6
2016-05-03 18:43:46 +00: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
Rachel Zhang
8088907360
Launch Help & Feedback
...
Bug: 28139684
Bug: 28141203
Change-Id: I9853fa5fd789cd6404dddfd9b00b7dc3afe73d91
2016-05-03 10:48:05 -07:00
Baligh Uddin
0737787235
Import translations. DO NOT MERGE
...
Change-Id: Ief7fdf92fd579e99764edbf2438caa44d6735da7
Auto-generated-cl: translation import
2016-05-03 01:39:46 -07:00
Baligh Uddin
e118a96fd0
Import translations. DO NOT MERGE
...
Change-Id: If49388814aafcf05ad9b1899b7e991463c8c3662
Auto-generated-cl: translation import
2016-05-03 01:25:52 -07:00
Baligh Uddin
2741388fb6
Import translations. DO NOT MERGE
...
Change-Id: If2bd78844cb256f0ae348be37369466f0deb01fe
Auto-generated-cl: translation import
2016-05-03 00:30:42 -07:00
Clara Bayarri
c970be3876
Merge "Remove Secure Startup option from Security Settings" into nyc-dev am: 35bf932eb0 am: 1159a0a79c
...
am: 2e8d2fabfc
* commit '2e8d2fabfcb815a2199195dd1a7669b59338fdf4':
Remove Secure Startup option from Security Settings
Change-Id: I32d3c509f0b7ba03acc8f933d2840bb92c293872
2016-04-29 17:43:41 +00:00
Clara Bayarri
2e8d2fabfc
Merge "Remove Secure Startup option from Security Settings" into nyc-dev am: 35bf932eb0
...
am: 1159a0a79c
* commit '1159a0a79cdf9fcbbae574198ae5ba192ef84aca':
Remove Secure Startup option from Security Settings
Change-Id: I2721e0e9e2d5920e54b549124664a303a591ae54
2016-04-29 17:41:14 +00:00
Clara Bayarri
99e5285425
Merge "Remove Secure Startup option from Security Settings" into nyc-dev
...
am: 35bf932eb0
* commit '35bf932eb0daf8038cc917508839784953c45c72':
Remove Secure Startup option from Security Settings
Change-Id: Ife90c8effce61106a438ccd9158a001792810ede
2016-04-29 17:39:05 +00:00
Clara Bayarri
1159a0a79c
Merge "Remove Secure Startup option from Security Settings" into nyc-dev
...
am: 35bf932eb0
* commit '35bf932eb0daf8038cc917508839784953c45c72':
Remove Secure Startup option from Security Settings
Change-Id: Id555f9a2abadf9a941e5e63e60ea55c5ce7179bd
2016-04-29 17:38:56 +00:00