PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
30,859 Commits 1 Branch 0 Tags
c459be6e29abd21f4421dabc957a148492764bd4
Commit Graph

30859 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Svetoslav Ganov
c459be6e29 Merge "Only sync adapters with access can see an account - settings" into nyc-mr1-dev am: de090f3f85 am: 3300192cdb 
am: 6c5c9ba8cb

Change-Id: Ib4a9e14a63bc6f2cb4cd49b1c20e3efacc95f204
 2016-08-24 16:17:57 +00:00
Svetoslav Ganov
eccd37267c Only sync adapters with access can see an account - settings am: 6f9bf1da90 am: a2c7515a3f 
am: 00f7070f18

Change-Id: Ib7efe9e11caf2e53cc73627d9ccc7ae834145b6a
 2016-08-24 16:16:54 +00:00
Sudheer Shanka
87ec133f52 Merge "Show summary of "Add user" item" into nyc-mr1-dev am: acd34a9c72 am: 35221c350d 
am: e9f958f2b6

Change-Id: I050044222863cca5884461a555c05f47d2cc9a0e
 2016-08-24 16:16:52 +00:00
Yoshinori Hirano
45655e5c7b Show summary of "Add user" item am: 2ce843b00e am: 9224414477 
am: c1cbdef71d

Change-Id: I21c85d4f833fa98ae40eb546dc838b4da9b40bd0
 2016-08-24 16:16:51 +00:00
Maurice Lam
0b9da48d9f Merge "Position fingerprint progress in the center on landscape" into nyc-mr1-dev am: 497704a2cf am: b62638e83b 
am: ce6a2356ad

Change-Id: I3c0a875966275473a8d411ca444e29fae22c7357
 2016-08-24 16:16:50 +00:00
Maurice Lam
c13e3fecda Position fingerprint progress in the center on landscape am: 5fffa74d68 am: b2d7eced0b 
am: 44f8e7ab2e

Change-Id: I1a6448f769a82516337fb4366e0916f833998337
 2016-08-24 16:16:49 +00:00
Fan Zhang
a92ab8d635 Force phone number display to be LTR in support tab. am: 68c6d9956f am: 197829fb8a am: 97df6439b9 
am: 7d64ded43f

Change-Id: I0a369b23fdd9374b0062839d168269605d0c5d2c
 2016-08-24 16:15:56 +00:00
Maurice Lam
6d64e62233 Merge "Remove duplicate string for fingerprint enroll" into nyc-mr1-dev am: 993d37749e am: 8291dc725d 
am: 017d6048c4

Change-Id: Ied2a171fa9bb1da0b55841a01249b0c483d4276c
 2016-08-24 16:15:54 +00:00
Maurice Lam
85164db460 Remove duplicate string for fingerprint enroll am: 64ac93ba40 am: e0c8fcf453 
am: 1755a04f6b

Change-Id: I0624be0fc853864a7f82fabf3f4c8fccd8cb7388
 2016-08-24 16:15:53 +00:00
Doris Ling
cc0ff8b164 Merge "Log settings suggestions events only once." into nyc-mr1-dev am: c4e5acedba am: 12a0952d49 
am: 7da62c35a7

Change-Id: I0729d5c62c7c29c173d419aace20ac44a99fd55b
 2016-08-24 16:15:53 +00:00
Doris Ling
7044490cfe resolve merge conflicts of f757d1e to nyc-mr1-dev-plus-aosp 
am: 6dcd71756d

Change-Id: Iae1f9cbd2f8e677e82f27e69de35228a4ae35b99
 2016-08-24 16:15:51 +00:00
Andrew Sapperstein
f36eac3889 resolve merge conflicts of 6890d53 to master 
Change-Id: I61c1ed150fe311c4e07df524b5c0577f35d3bd60
 2016-08-24 10:50:28 -04:00
Pat Tjin
28fcccd185 Merge "Remove duplicate KEY_DEVICE_MODEL string set" 2016-08-24 04:48:08 +00:00
Fan Zhang
6c5c9ba8cb Use isOemUnlockEnabled to drive oem unlocking toggle. am: 83f91f61ae 
am: 2fd3f18e27

Change-Id: Ied30f294df99b869e06ee4dc11c300da3fd70ade
 2016-08-24 02:33:38 +00:00
Svetoslav Ganov
00f7070f18 Merge "Only sync adapters with access can see an account - settings" into nyc-mr1-dev am: de090f3f85 
am: 3300192cdb

Change-Id: Icd81d8d32a85f5cb926d84f5b3239b93d6ce0d7e
 2016-08-24 02:10:31 +00:00
Svetoslav Ganov
e9f958f2b6 Only sync adapters with access can see an account - settings am: 6f9bf1da90 
am: a2c7515a3f

Change-Id: I4b0d16639837e73fced0260e93b29c08aa4b7346
 2016-08-24 02:10:20 +00:00
Sudheer Shanka
c1cbdef71d Merge "Show summary of "Add user" item" into nyc-mr1-dev am: acd34a9c72 
am: 35221c350d

Change-Id: Icfef29048747e36f5fdac374be18d092ccb71c9d
 2016-08-24 02:10:18 +00:00
Yoshinori Hirano
ce6a2356ad Show summary of "Add user" item am: 2ce843b00e 
am: 9224414477

Change-Id: Iee1fe204b1d48b57c8d0577eb86dc3518c144b6f
 2016-08-24 02:10:16 +00:00
Maurice Lam
44f8e7ab2e Merge "Position fingerprint progress in the center on landscape" into nyc-mr1-dev am: 497704a2cf 
am: b62638e83b

Change-Id: Ic3dccbbb7d27b157076c3009468f7c8a5acba34d
 2016-08-24 02:10:15 +00:00
Maurice Lam
7d64ded43f Position fingerprint progress in the center on landscape am: 5fffa74d68 
am: b2d7eced0b

Change-Id: I24602a6cb4ae2a1ca56d6fffac25cbe6952d0b64
 2016-08-24 02:09:28 +00:00
Fan Zhang
017d6048c4 Force phone number display to be LTR in support tab. am: 68c6d9956f am: 197829fb8a 
am: 97df6439b9

Change-Id: I38eac1a0e7a55298cec6a818a051424306721752
 2016-08-24 02:09:27 +00:00
Maurice Lam
1755a04f6b Merge "Remove duplicate string for fingerprint enroll" into nyc-mr1-dev am: 993d37749e 
am: 8291dc725d

Change-Id: I881722545a7b1605705377406f785bfa3ea0fa4b
 2016-08-24 02:09:27 +00:00
Maurice Lam
7da62c35a7 Remove duplicate string for fingerprint enroll am: 64ac93ba40 
am: e0c8fcf453

Change-Id: I1ea9fad83d06ec3526921f942f3476d008717ec4
 2016-08-24 02:09:26 +00:00
Doris Ling
6dcd71756d Merge "Log settings suggestions events only once." into nyc-mr1-dev am: c4e5acedba 
am: 12a0952d49

Change-Id: Iac5b318d0bc9f929e34fac9c46dfd3b020889738
 2016-08-24 02:09:25 +00:00
Doris Ling
6890d538ae resolve merge conflicts of f757d1e to nyc-mr1-dev-plus-aosp 
Change-Id: I1e53b78977bb32fe34462cf46bbfe66626574e65
 2016-08-23 19:02:31 -07:00
TreeHugger Robot
98d840576e Merge "Refactored Screenshot preference to be dependent on context preference." 2016-08-24 01:37:57 +00:00
Fan Zhang
2fd3f18e27 Use isOemUnlockEnabled to drive oem unlocking toggle. 
am: 83f91f61ae

Change-Id: I11d1210beaa26a0bad54e03f7a08817a3c500fe3
 2016-08-24 00:36:10 +00:00
Svetoslav Ganov
3300192cdb Merge "Only sync adapters with access can see an account - settings" into nyc-mr1-dev 
am: de090f3f85

Change-Id: I2d62ede26a41eee9f7a98a17df255c2b2f516b6c
 2016-08-23 23:35:22 +00:00
Svetoslav Ganov
a2c7515a3f Only sync adapters with access can see an account - settings 
am: 6f9bf1da90

Change-Id: Ia97c5fe3a1101b9472bc8370671fba838d59edf7
 2016-08-23 23:35:21 +00:00
Matthew Fritze
90d59f2332 Refactored Screenshot preference to be dependent on context preference. 
Tests: Manual. 

Change-Id: I2fde1a67ade4bf89bf38b4eae0ca98074cca868c
Fixes: 30681087
 2016-08-23 23:32:46 +00:00
TreeHugger Robot
de090f3f85 Merge "Only sync adapters with access can see an account - settings" into nyc-mr1-dev 2016-08-23 23:26:48 +00:00
Sudheer Shanka
35221c350d Merge "Show summary of "Add user" item" into nyc-mr1-dev 
am: acd34a9c72

Change-Id: Idc7d32b89a569e1201097dad3ad480a82b7f75fd
 2016-08-23 23:25:09 +00:00
Yoshinori Hirano
9224414477 Show summary of "Add user" item 
am: 2ce843b00e

Change-Id: I413ab13bbf58b7100348d20c02aeeff850a84639
 2016-08-23 23:25:05 +00:00
Sudheer Shanka
acd34a9c72 Merge "Show summary of "Add user" item" into nyc-mr1-dev 2016-08-23 23:23:08 +00:00
Maurice Lam
b62638e83b Merge "Position fingerprint progress in the center on landscape" into nyc-mr1-dev 
am: 497704a2cf

Change-Id: I1e33c4ce331e2060b91b8038aca35c4a746b8edc
 2016-08-23 23:08:05 +00:00
Maurice Lam
b2d7eced0b Position fingerprint progress in the center on landscape 
am: 5fffa74d68

Change-Id: I8a989108c1a72eef25bd0fe90875be856bd81cbc
 2016-08-23 23:08:04 +00:00
Maurice Lam
497704a2cf Merge "Position fingerprint progress in the center on landscape" into nyc-mr1-dev 2016-08-23 22:57:32 +00:00
Fan Zhang
97df6439b9 Force phone number display to be LTR in support tab. am: 68c6d9956f 
am: 197829fb8a

Change-Id: Iccbd0ec126818f295d45855a8b2bc3d338bd9939
 2016-08-23 22:46:01 +00:00
Fan Zhang
197829fb8a Force phone number display to be LTR in support tab. 
am: 68c6d9956f

Change-Id: Ib5a7b11f9063af047f37a1f342ec715c590cb337
 2016-08-23 22:43:30 +00:00
Maurice Lam
8291dc725d Merge "Remove duplicate string for fingerprint enroll" into nyc-mr1-dev 
am: 993d37749e

Change-Id: I22a772df18ca5439912ad8b18e4aef0234f558fa
 2016-08-23 22:23:01 +00:00
Maurice Lam
e0c8fcf453 Remove duplicate string for fingerprint enroll 
am: 64ac93ba40

Change-Id: Id49d79278ad68b0b49194576467b5e0714c55c89
 2016-08-23 22:23:00 +00:00
Maurice Lam
993d37749e Merge "Remove duplicate string for fingerprint enroll" into nyc-mr1-dev 2016-08-23 22:19:57 +00:00
Doris Ling
12a0952d49 Merge "Log settings suggestions events only once." into nyc-mr1-dev 
am: c4e5acedba

Change-Id: Ice4efccbb63061053bc1b2ea75f65fcfe41555d0
 2016-08-23 22:18:00 +00:00
Doris Ling
f757d1ede8 Log settings suggestions events only once. 
am: bfbb964cb1

Change-Id: If4e3e15b56c7e5a99eb54376c519019ff44d6a34
 2016-08-23 22:18:00 +00:00
Doris Ling
e08dcee5df Add scrollbar to Settings app. am: 124251d54e am: 13a4eeb2a9 
am: 9ca6758e0b  -s ours

Change-Id: Icb6cd08141983408afdf7d81c9df80f681d77d71
 2016-08-23 22:16:40 +00:00
Doris Ling
c4e5acedba Merge "Log settings suggestions events only once." into nyc-mr1-dev 2016-08-23 22:15:52 +00:00
Fan Zhang
83f91f61ae Use isOemUnlockEnabled to drive oem unlocking toggle. 
Bug: 31031467
Test: manually turned on/off persistent_data_block

Change-Id: I21d18a898a220f9e46a53715d4b4fa01c7116e7f
 2016-08-23 15:14:19 -07:00
Doris Ling
9ca6758e0b Add scrollbar to Settings app. am: 124251d54e 
am: 13a4eeb2a9

Change-Id: Ifbb3c930d259bc65ec54ffa496c2cfcdb5bb9a63
 2016-08-23 21:46:42 +00:00
Svetoslav Ganov
6f9bf1da90 Only sync adapters with access can see an account - settings 
This change ensures that when the user tries to toggle a sync for a
sync adapter that doesn't have access to an account we show UI for
the user to approve the sync.

bug:28163381

Change-Id: I59802df6614572cf0eaf4b72a177beb111b87b34
 2016-08-23 21:44:47 +00:00
Doris Ling
13a4eeb2a9 Add scrollbar to Settings app. 
am: 124251d54e

Change-Id: Id59772914f83860c5ff46ace71d640e17623c98d
 2016-08-23 21:43:33 +00:00