PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
22,210 Commits 1 Branch 0 Tags
b2bf53703095b2fd5eadfcd677b3dbb51a75cb17
Commit Graph

22210 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Geoff Mendal
b2bf537030 am 0baeee0c: (-s ours) am 79670bbe: (-s ours) Import translations. DO NOT MERGE 
am: 392858626b  -s ours

* commit '392858626b0b4583a71372a9b05be94927958d2f':
 2016-01-11 20:37:37 +00:00
Alan Viverette
923938b6c9 am fb7827f3: am d4988442: Point to Material.Settings themes 
am: d508cd9b6f

* commit 'd508cd9b6f7d7e567d1989be4b365bfee0112704':
 2016-01-11 20:37:26 +00:00
Yorke Lee
1d942caaf9 am 80848e20: am 169f824b: Merge "Rename setDefaultDialerApplication for consistency" into mnc-dev 
am: beed867ada

* commit 'beed867ada66f98c1867dbf4bdbb13d1bb0c1a81':
 2016-01-11 20:37:15 +00:00
Jorim Jaggi
3e7e01a23e am 80134266: am 4a2423ba: Move fingerprint enroll logic into sidecar fragment 
am: 0f6400fac5

* commit '0f6400fac5ba7d9956505f7035545fe082a33f26':
 2016-01-11 20:37:04 +00:00
Jorim Jaggi
340b8dcb7b am 6ecd1005: am 11eae045: Allow incremental builds for settings. 
am: a1bc287cc3

* commit 'a1bc287cc34a5d62c47f3c9768ab3d080234de7b':
 2016-01-11 20:36:53 +00:00
Maurice Lam
7c63d887e0 am ab82d2fd: am 9fab5c1d: Merge "[LockSetup] Hide back button in notification interstitial" into mnc-dev 
am: 3cd6eabcb8

* commit '3cd6eabcb8cd0f36c861891c7c8d5bfdea6144e2':
 2016-01-11 20:36:42 +00:00
Maurice Lam
e28f490134 am 824b09cb: am 80ca2687: Merge "[WifiSetup] Show progress bar when scanning" into mnc-dev 
am: bb61d7bc66

* commit 'bb61d7bc6623fe9373deb75eca180399800ad4b7':
 2016-01-11 20:36:30 +00:00
Jason Monk
c87c93659d am e5f7ba7f: am 70c5472f: Merge "Move process stats screen into memory screen." into mnc-dev 
am: 5e1e20237d

* commit '5e1e20237d3fbc0c1201e27bbd9fa7e21be0c430':
 2016-01-11 20:36:19 +00:00
Geoff Mendal
87a98ceb75 am 6d53b908: (-s ours) am d1b9edab: (-s ours) Import translations. DO NOT MERGE 
am: e2b5070c10  -s ours

* commit 'e2b5070c1096e546ff1e1429732b25c1af7d16f5':
 2016-01-11 20:36:07 +00:00
Geoff Mendal
34ed83bd9d am 3eb3af9d: (-s ours) am c5184ff1: (-s ours) Import translations. DO NOT MERGE 
am: 5312261de7  -s ours

* commit '5312261de76661827eae1915bcf4d42fa36309b0':
 2016-01-11 20:35:53 +00:00
Geoff Mendal
ab3b13d0ed Import translations. DO NOT MERGE 
am: 1cb1ad2c55  -s ours

* commit '1cb1ad2c55d1997dd5c31e5aed5062a4d395238f':
  Import translations. DO NOT MERGE
 2015-12-11 18:04:00 -08:00
Geoff Mendal
1cb1ad2c55 Import translations. DO NOT MERGE 
Auto-generated-cl: translation import

Bug: 26151591
Change-Id: Ie838ac1e234ebb27ad5be9fde95d25173a571e78
 2015-12-11 17:58:32 -08:00
Geoff Mendal
d2981b099e Revert "Import translations. DO NOT MERGE" 
am: 7bafd5ee2f  -s ours

* commit '7bafd5ee2f2c6fb3c3e3f456e855ab34c06f7c91':
  Revert "Import translations. DO NOT MERGE"
 2015-12-11 17:44:31 -08:00
Geoff Mendal
7bafd5ee2f Revert "Import translations. DO NOT MERGE" 
This reverts commit df57be8aef.

Change-Id: Ie47ab587c4ea43cdd6fb608b0c5dfe26e534ab93
 2015-12-12 01:42:00 +00:00
Geoff Mendal
bc84451452 Import translations. DO NOT MERGE 
am: df57be8aef  -s ours

* commit 'df57be8aef6dd1760e72d7f76490048eeb425a3e':
  Import translations. DO NOT MERGE
 2015-12-11 16:30:09 -08:00
Geoff Mendal
df57be8aef Import translations. DO NOT MERGE 
Auto-generated-cl: translation import

Bug: 26151591
Change-Id: If1d7f9358c3fa2e17826385ea967c09442f08285
 2015-12-11 16:05:26 -08:00
Hyejin Kim
c46bbd6373 Add IMS settings to Network setting reset 
am: 623852f6c7

* commit '623852f6c772b7685abade493b304da1f71b4c00':
  Add IMS settings to Network setting reset
 2015-12-06 18:37:50 +00:00
Hyejin Kim
623852f6c7 Add IMS settings to Network setting reset 
Add the factory reset function to be used to reset IMS settings

BUG=25300757
Change-Id: I78d2e919418b7a0b42f56af3442d7d98afe40d77
 2015-12-01 10:59:25 -08:00
Geoff Mendal
bdbd6da522 Import translations. DO NOT MERGE am: 2102350ea3 -s ours am: 75dd183bf7 -s ours am: 74e9c3d348 -s ours 
am: 39be1461a8  -s ours

* commit '39be1461a876a4442e11dc26cff14ec80273baf0':
  Import translations. DO NOT MERGE
 2015-11-20 01:24:46 +00:00
Geoff Mendal
39be1461a8 Import translations. DO NOT MERGE am: 2102350ea3 -s ours am: 75dd183bf7 -s ours 
am: 74e9c3d348  -s ours

* commit '74e9c3d34840c6a33afd7cef4b8fb0e1b73c9a93':
  Import translations. DO NOT MERGE
 2015-11-20 01:19:50 +00:00
Geoff Mendal
74e9c3d348 Import translations. DO NOT MERGE am: 2102350ea3 -s ours 
am: 75dd183bf7  -s ours

* commit '75dd183bf7b99c995fe773e7b53a6604a6b53512':
  Import translations. DO NOT MERGE
 2015-11-20 01:14:23 +00:00
Geoff Mendal
75dd183bf7 Import translations. DO NOT MERGE 
am: 2102350ea3  -s ours

* commit '2102350ea33d8bbed50d9447889876fa295b3e8a':
  Import translations. DO NOT MERGE
 2015-11-20 01:09:14 +00:00
Geoff Mendal
2102350ea3 Import translations. DO NOT MERGE 
Auto-generated-cl: translation import

Change-Id: Ic959d8e81d2c9ab397ec7f84d78900631b92346d
 2015-11-20 01:02:07 +00:00
Russell Brenner
ebc5086d15 Merge "Block developer settings during SUW" into lmp-mr1-dev am: 56d630a3ed am: afe5eada5b am: 8e4f6fbc2e am: 5950ff1d69 am: 2b29501039 
am: f0d538f08d

* commit 'f0d538f08da7c45e545e51e93373afe38cbd518f':
  Block developer settings during SUW
 2015-11-17 20:32:03 +00:00
Russell Brenner
bcf3b75f57 [DO NOT MERGE] Preserve FRP lock if wiped during SUW am: 14bf226c79 am: 97759fa8d1 am: 6967df6421 -s ours am: 439033dd93 am: 38e932dc81 
am: 8199c3028c

* commit '8199c3028c05cd9c85b6f26fe656518f536bda69':
  [DO NOT MERGE] Preserve FRP lock if wiped during SUW
 2015-11-17 20:31:54 +00:00
Russell Brenner
f0d538f08d Merge "Block developer settings during SUW" into lmp-mr1-dev am: 56d630a3ed am: afe5eada5b am: 8e4f6fbc2e am: 5950ff1d69 
am: 2b29501039

* commit '2b295010392c532a47e02e5b003459a50d6d5a62':
  Block developer settings during SUW
 2015-11-17 20:23:22 +00:00
Russell Brenner
8199c3028c [DO NOT MERGE] Preserve FRP lock if wiped during SUW am: 14bf226c79 am: 97759fa8d1 am: 6967df6421 -s ours am: 439033dd93 
am: 38e932dc81

* commit '38e932dc816fe7aff6443bfa5648743f527aa097':
  [DO NOT MERGE] Preserve FRP lock if wiped during SUW
 2015-11-17 20:23:06 +00:00
Russell Brenner
2b29501039 Merge "Block developer settings during SUW" into lmp-mr1-dev am: 56d630a3ed am: afe5eada5b am: 8e4f6fbc2e 
am: 5950ff1d69

* commit '5950ff1d69ca27c09569f40862201ede261c831e':
  Block developer settings during SUW
 2015-11-17 20:14:22 +00:00
Russell Brenner
38e932dc81 [DO NOT MERGE] Preserve FRP lock if wiped during SUW am: 14bf226c79 am: 97759fa8d1 am: 6967df6421 -s ours 
am: 439033dd93

* commit '439033dd93417b98acff392865166503a507ff30':
  [DO NOT MERGE] Preserve FRP lock if wiped during SUW
 2015-11-17 20:14:10 +00:00
Russell Brenner
5950ff1d69 Merge "Block developer settings during SUW" into lmp-mr1-dev am: 56d630a3ed am: afe5eada5b 
am: 8e4f6fbc2e

* commit '8e4f6fbc2ee74a3f7ede9d63f5a2d9c0ce153f70':
  Block developer settings during SUW
 2015-11-17 20:05:54 +00:00
Russell Brenner
439033dd93 [DO NOT MERGE] Preserve FRP lock if wiped during SUW am: 14bf226c79 am: 97759fa8d1 
am: 6967df6421  -s ours

* commit '6967df642114a9c84d993cfd544d5a32f04c26b1':
  [DO NOT MERGE] Preserve FRP lock if wiped during SUW
 2015-11-17 20:05:43 +00:00
Russell Brenner
8e4f6fbc2e Merge "Block developer settings during SUW" into lmp-mr1-dev am: 56d630a3ed 
am: afe5eada5b

* commit 'afe5eada5bbc6d961c81e881be1f12b1bfcc83e4':
  Block developer settings during SUW
 2015-11-17 19:57:00 +00:00
Russell Brenner
6967df6421 [DO NOT MERGE] Preserve FRP lock if wiped during SUW am: 14bf226c79 
am: 97759fa8d1

* commit '97759fa8d1710c0ac87cd24c69a3d1f161ac3ec3':
  [DO NOT MERGE] Preserve FRP lock if wiped during SUW
 2015-11-17 19:56:48 +00:00
Russell Brenner
afe5eada5b Merge "Block developer settings during SUW" into lmp-mr1-dev 
am: 56d630a3ed

* commit '56d630a3eda390d8514c1e1d9f36c95e7808d1dd':
  Block developer settings during SUW
 2015-11-17 19:53:17 +00:00
Russell Brenner
97759fa8d1 [DO NOT MERGE] Preserve FRP lock if wiped during SUW 
am: 14bf226c79

* commit '14bf226c79ee16fc5dd502d81e12bf18b932f39e':
  [DO NOT MERGE] Preserve FRP lock if wiped during SUW
 2015-11-17 19:51:09 +00:00
Russell Brenner
6a7ff3186b Merge "Preserve FRP lock if wiped during SUW" into mnc-dev am: f0ff1631de am: 2075d98be6 
am: 7d44fe6fdb

* commit '7d44fe6fdb95dce08e4c8cd1a1c1a1c8f3ea4a63':
  Preserve FRP lock if wiped during SUW
 2015-11-17 01:37:51 +00:00
Russell Brenner
7d44fe6fdb Merge "Preserve FRP lock if wiped during SUW" into mnc-dev am: f0ff1631de 
am: 2075d98be6

* commit '2075d98be6199032d0bdf65d9e1789153e12fb66':
  Preserve FRP lock if wiped during SUW
 2015-11-17 01:29:12 +00:00
Russell Brenner
2075d98be6 Merge "Preserve FRP lock if wiped during SUW" into mnc-dev 
am: f0ff1631de

* commit 'f0ff1631dee1d988151f8260e6c65ff836a40e80':
  Preserve FRP lock if wiped during SUW
 2015-11-17 01:22:41 +00:00
Sanket Padawe
60461f3410 Uncheck checkbox for contact sharing by default for non carkit devices. am: 98f11fd1a4 am: 28eca8e8c2 
am: 773b8a3c44

* commit '773b8a3c4422ab9daf7adb62895568852b43882e':
  Uncheck checkbox for contact sharing by default for non carkit devices.
 2015-11-17 01:22:25 +00:00
Sanket Padawe
773b8a3c44 Uncheck checkbox for contact sharing by default for non carkit devices. am: 98f11fd1a4 
am: 28eca8e8c2

* commit '28eca8e8c2d9e11a9f304e85ff3a34819edd68a9':
  Uncheck checkbox for contact sharing by default for non carkit devices.
 2015-11-17 01:16:41 +00:00
Russell Brenner
f0ff1631de Merge "Preserve FRP lock if wiped during SUW" into mnc-dev 2015-11-17 01:14:11 +00:00
Russell Brenner
56d630a3ed Merge "Block developer settings during SUW" into lmp-mr1-dev 2015-11-17 01:13:55 +00:00
Sanket Padawe
28eca8e8c2 Uncheck checkbox for contact sharing by default for non carkit devices. 
am: 98f11fd1a4

* commit '98f11fd1a4752beed56b5fe7a4097ec0ae0c74b3':
  Uncheck checkbox for contact sharing by default for non carkit devices.
 2015-11-17 01:12:09 +00:00
Russell Brenner
14bf226c79 [DO NOT MERGE] Preserve FRP lock if wiped during SUW 
Guard against FRP attacks by keeping the persistent data block
intact, if a factory reset has been issued during SUW.

Bug: 25290269
Change-Id: Id26b4c10235ad126632b71875592a4fa70a39b24
 2015-11-13 18:10:44 +00:00
Russell Brenner
de4fc8eb2a Preserve FRP lock if wiped during SUW 
Guard against FRP attacks by keeping the persistent data block
intact, if a factory reset has been issued during SUW.

[resolves merge conflicts with ag/808069]

Bug: 25290269
Change-Id: Id26b4c10235ad126632b71875592a4fa70a39b24
 2015-11-13 18:08:51 +00:00
Sanket Padawe
df5b8c5b65 Uncheck checkbox for contact sharing by default for non carkit devices. am: dbc47fb262 
am: 0ad16831ee

* commit '0ad16831ee2e2029a0fc2891c8007505bb9779cd':
  Uncheck checkbox for contact sharing by default for non carkit devices.
 2015-11-13 00:02:30 +00:00
Sanket Padawe
0ad16831ee Uncheck checkbox for contact sharing by default for non carkit devices. 
am: dbc47fb262

* commit 'dbc47fb262a4273417d99dabab757854aa3b0eaf':
  Uncheck checkbox for contact sharing by default for non carkit devices.
 2015-11-12 23:57:48 +00:00
Sanket Padawe
98f11fd1a4 Uncheck checkbox for contact sharing by default for non carkit devices. 
+ In BT pairing dialog, uncheck checkbox for contact sharing by default
for devices not recognized as carkits at pair time.

Bug: 23607427
Change-Id: I7f1d40d86e713e248d3c225459be4895c4f75d76
(cherry picked from commit dbc47fb262)
 2015-11-12 23:54:06 +00:00
Sanket Padawe
dbc47fb262 Uncheck checkbox for contact sharing by default for non carkit devices. 
+ In BT pairing dialog, uncheck checkbox for contact sharing by default
for devices not recognized as carkits at pair time.

Bug: 23607427
Change-Id: I7f1d40d86e713e248d3c225459be4895c4f75d76
 2015-11-12 14:55:51 -08:00
Russell Brenner
4836ab6df4 Block developer settings during SUW 
Block access to development settings by tapping on the build number
in "About phone". Once SUW has completed, taps will be allowed.

Bug: 25290269
Change-Id: I9b2787712237f28fba446abab15a9e1c075d0419
 2015-11-10 12:15:48 -08:00