PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
28,439 Commits 1 Branch 0 Tags
797928a6720974f95e882c2fa57396dba5490e8c
Commit Graph

28439 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Robin Lee
963c3a4e9f Merge "TrustCredentials listview should be expanded by default" into nyc-dev 2016-05-06 15:27:42 +00:00
Bill Yi
4c8561c80d Merge "Import translations. DO NOT MERGE" into nyc-dev am: 7f1b86e5df -s ours am: 19f57505a0 -s ours 
am: 64b3799ff8  -s ours

* commit '64b3799ff8f23ebf522feb17485a53f75f1ed173':
  Import translations. DO NOT MERGE

Change-Id: Ifa0b81a2096c1a5dc0d396d0fe25fdde67a2b056
 2016-05-06 14:34:22 +00:00
Bill Yi
e9c8018a21 Import translations. DO NOT MERGE am: fb917b0b5d -s ours 
am: d33940e148  -s ours

* commit 'd33940e1480b8c0062e905dd59e69e1a1d80e796':
  Import translations. DO NOT MERGE

Change-Id: I4f6e63345e9e15c618c9dbbf2d5e9ade29a768d6
 2016-05-06 14:34:18 +00:00
Bill Yi
64b3799ff8 Merge "Import translations. DO NOT MERGE" into nyc-dev am: 7f1b86e5df -s ours 
am: 19f57505a0  -s ours

* commit '19f57505a0a894386f8cd39ead0545e1afcd45dc':
  Import translations. DO NOT MERGE

Change-Id: I7858ba5ad58e8954035dfdbf8b197fadf1771ae8
 2016-05-06 14:32:55 +00:00
Bill Yi
d33940e148 Import translations. DO NOT MERGE 
am: fb917b0b5d  -s ours

* commit 'fb917b0b5d65971420868d139260f5b5d04a45f3':
  Import translations. DO NOT MERGE

Change-Id: Icadb4a0a7fd2bfb740ab085ea13b5f38591d81d4
 2016-05-06 14:28:10 +00:00
Bill Yi
19f57505a0 Merge "Import translations. DO NOT MERGE" into nyc-dev 
am: 7f1b86e5df  -s ours

* commit '7f1b86e5df66271371cd2e570b5a32c12cde7fee':
  Import translations. DO NOT MERGE

Change-Id: I74aa9a2ba14f127ab8ba758d2a65f24f4076e2a9
 2016-05-06 14:26:57 +00:00
TreeHugger Robot
03f207aa13 Merge "Import translations. DO NOT MERGE" 2016-05-06 14:16:03 +00:00
TreeHugger Robot
7f1b86e5df Merge "Import translations. DO NOT MERGE" into nyc-dev 2016-05-06 14:14:48 +00:00
Clara Bayarri
cbb6821339 Merge "Remove invisible object in A11y Settings screens\' menu" into nyc-dev am: 2540d66bfe am: 70c5569a18 
am: 6d11ab8a93

* commit '6d11ab8a93bf8ce071898caae3667e7eb1a4c05b':
  Remove invisible object in A11y Settings screens' menu

Change-Id: I7d8714a92a16e57c013df71fa3f0fc5c4ee4c24c
 2016-05-06 13:49:56 +00:00
Clara Bayarri
6d11ab8a93 Merge "Remove invisible object in A11y Settings screens\' menu" into nyc-dev am: 2540d66bfe 
am: 70c5569a18

* commit '70c5569a1877d2889e16a9d32133e5293bfacf83':
  Remove invisible object in A11y Settings screens' menu

Change-Id: I4addaccd6a0182ff0f2e7303272f0a112cba37e0
 2016-05-06 13:45:06 +00:00
Clara Bayarri
70c5569a18 Merge "Remove invisible object in A11y Settings screens\' menu" into nyc-dev 
am: 2540d66bfe

* commit '2540d66bfed468615d560e93eaaa3621296db0ec':
  Remove invisible object in A11y Settings screens' menu

Change-Id: I946cec97b7d891f29b8b026d5889511b227512d3
 2016-05-06 13:40:18 +00:00
Clara Bayarri
2540d66bfe Merge "Remove invisible object in A11y Settings screens' menu" into nyc-dev 2016-05-06 13:36:11 +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
Clara Bayarri
e812350286 Remove invisible object in A11y Settings screens' menu 
Bug: 28459491
Change-Id: I95250078bf6470d0bd4b6b40f25c13eb6aec93c8
 2016-05-06 12:18:13 +01: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
Bill Yi
6dbff067c1 Import translations. DO NOT MERGE 
Change-Id: Iee3d28f6bb5f0be3102550f81a5e880a8da98349
Auto-generated-cl: translation import
 2016-05-05 20:50:27 -07:00
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
Maurice Lam
d2be795d83 Merge "Don\'t draw divider under headers" into nyc-mr1-dev am: 02e8a0d477 
am: b4e93c2a83

* commit 'b4e93c2a83b4f933a931ede73f8df8f7964045d1':
  Don't draw divider under headers

Change-Id: I3d784b9797d62a69cea7d7ed48f17fc0343b962b
 2016-05-05 20:36:08 +00:00
Maurice Lam
b4e93c2a83 Merge "Don\'t draw divider under headers" into nyc-mr1-dev 
am: 02e8a0d477

* commit '02e8a0d4779f151e3e7d5aa08d6423295f4c9031':
  Don't draw divider under headers

Change-Id: Iff646b0db3fd513130e1f7fb0d1de92dbaadfbd9
 2016-05-05 20:31:11 +00:00
Maurice Lam
02e8a0d477 Merge "Don't draw divider under headers" into nyc-mr1-dev 2016-05-05 20:19:55 +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
761c5a6340 Merge "Merge "InputSettings: Define order of items in Physical keyboards screen." into nyc-dev am: 56f7bc44a1 am: 48bd6631af" into nyc-mr1-dev-plus-aosp 
am: 4f9d0c95c5

* commit '4f9d0c95c520abe8f17b4f17955fa9241fcea16c':

Change-Id: Ib1aceef944bb460502a0f424581093704793aec6
 2016-05-05 16:56:07 +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
Android Build Merger (Role)
4f9d0c95c5 Merge "Merge "InputSettings: Define order of items in Physical keyboards screen." into nyc-dev am: 56f7bc44a1 am: 48bd6631af" into nyc-mr1-dev-plus-aosp 2016-05-05 16:50:44 +00:00
Abodunrinwa Toki
99a0fbd9c4 Merge "InputSettings: Define order of items in Physical keyboards screen." into nyc-dev am: 56f7bc44a1 
am: 48bd6631af

* commit '48bd6631afd8ca7c64dc23afa2d694b18932c127':
  InputSettings: Define order of items in Physical keyboards screen.

Change-Id: Icfc795b0473b21af94f5cf0e17f598fc95568ce6
 2016-05-05 16:50:33 +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
Jason Monk
d27fab1510 Merge "Don\'t crash on non-app data usage" into nyc-dev am: d1a4e452ed am: 1c06aedc3f 
am: aa91cfe46b

* commit 'aa91cfe46b5f27ab48d8f30e48694b83fed07315':

Change-Id: I62f5cd7a332b230af5bc61d897d0818a9b7cc02d
 2016-05-05 16:01:54 +00:00
Jason Monk
945690bea6 Merge "Fix cell data limit dialog title" into nyc-dev am: 2a6bc40d49 am: 0c7d11fe56 
am: abbea55388

* commit 'abbea5538832678aaf44e07683a7c80e2c405972':

Change-Id: I610dc416f01ff76675b227558f1b276475de7c66
 2016-05-05 16:01:53 +00:00
Jason Monk
9e4531f691 Merge "Don\'t crash on non-app data usage" into nyc-dev am: d1a4e452ed am: 9c38c20900 
am: 6a0f1d6997

* commit '6a0f1d69975b475fdaabc4b46286abb37be5ab91':
  Don't crash on non-app data usage

Change-Id: If2678c2ef35d437b85b8fa1c8e125b39ea61cfed
 2016-05-05 16:01:52 +00:00
Jason Monk
6eb53e42e0 Merge "Fix cell data limit dialog title" into nyc-dev am: 2a6bc40d49 am: 6f71ed9dbb 
am: ce1fa74716

* commit 'ce1fa7471648daac5abe5d3d322de3798ab8aea9':
  Fix cell data limit dialog title

Change-Id: I4f337ad301b16edc173ff903d5105075b36782a2
 2016-05-05 16:01:50 +00:00
Jason Monk
aa91cfe46b Merge "Don\'t crash on non-app data usage" into nyc-dev am: d1a4e452ed 
am: 1c06aedc3f

* commit '1c06aedc3fb8a973ae14fe3793bc239d3df862eb':

Change-Id: Ief5cbe7214d1d4f3af477acffde314c9bacfc386
 2016-05-05 15:55:53 +00:00
Jason Monk
abbea55388 Merge "Fix cell data limit dialog title" into nyc-dev am: 2a6bc40d49 
am: 0c7d11fe56

* commit '0c7d11fe568ec258165f6b94b916c72a533b09d7':

Change-Id: Ie21f67d2295be1e208a8e0cbbb14742afe3900d5
 2016-05-05 15:55:52 +00:00
Jason Monk
6a0f1d6997 Merge "Don\'t crash on non-app data usage" into nyc-dev am: d1a4e452ed 
am: 9c38c20900

* commit '9c38c209001d0151bc4e58a2b5c8f95bfb2d1cc4':
  Don't crash on non-app data usage

Change-Id: If07b3e928a6daabfdfb82144211f4e2996ec2b87
 2016-05-05 15:53:25 +00:00
Jason Monk
ce1fa74716 Merge "Fix cell data limit dialog title" into nyc-dev am: 2a6bc40d49 
am: 6f71ed9dbb

* commit '6f71ed9dbb92fae8bcd4aa32000f656f7efd8467':
  Fix cell data limit dialog title

Change-Id: I480483e8a259c0c8ebfea79f82dbd09a30e44093
 2016-05-05 15:53:24 +00:00
Jason Monk
9c38c20900 Merge "Don\'t crash on non-app data usage" into nyc-dev 
am: d1a4e452ed

* commit 'd1a4e452ed659f4f52b0b72f54da1100c6b1f512':
  Don't crash on non-app data usage

Change-Id: I46b35f11555442c2b7e1301d1dec8ee95807f36c
 2016-05-05 15:47:54 +00:00
Jason Monk
6f71ed9dbb Merge "Fix cell data limit dialog title" into nyc-dev 
am: 2a6bc40d49

* commit '2a6bc40d497d1bc0fdfc9cc86bc4db72791909b7':
  Fix cell data limit dialog title

Change-Id: Ia087f0ace8cb1f9a3c93ced1b3500207b6d63cf4
 2016-05-05 15:47:54 +00:00