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

22107 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jason Monk
769ba03b8f am 0557f4c3: am b46b9934: am 6d8fdb82: am 838c8432: Merge "Remove tuner from development settings" into mnc-dev 
* commit '0557f4c353448c55bbf82a8be75e515cf7f6371c':
  Remove tuner from development settings
 2015-07-24 03:45:55 +00:00
Maurice Lam
11d1f6d3a1 am f16673ba: am 36c76014: Merge "[Fingerprint] Show skip button during SUW" into mnc-dev 
* commit 'f16673bab63f950aa5687dc54b83515e35d4755f':
  [Fingerprint] Show skip button during SUW
 2015-07-24 03:34:46 +00:00
Geoff Mendal
217aebd32d am 13cd0b25: (-s ours) am f305e853: (-s ours) am 5376d54e: (-s ours) Import translations. DO NOT MERGE 
* commit '13cd0b25734e215f3369b0c5367dafdc74c070da':
  Import translations. DO NOT MERGE
 2015-07-24 03:26:34 +00:00
Geoff Mendal
03fe71ed00 am cb113be5: (-s ours) am 28718aeb: (-s ours) Import translations. DO NOT MERGE 
* commit 'cb113be57e3eb49871c77ce5317d644963e033af':
  Import translations. DO NOT MERGE
 2015-07-24 03:26:33 +00:00
Svetoslav Ganov
ea80c4b251 am 1fa5f4b3: am 6c2d4d73: am cce844a7: Merge "Reset permissions and app links when clearing app preferences - settings" into mnc-dev 
* commit '1fa5f4b33629a8995f44c56b3feb221ef0122477':
  Reset permissions and app links when clearing app preferences - settings
 2015-07-24 03:26:31 +00:00
Jason Monk
c9607b39f8 am e9b97364: am 14983fc6: am 8bf5f307: Merge "Fix battery detail issues with "Android OS"" into mnc-dev 
* commit 'e9b97364157c83ed9823f323e2f515bc2e5fc8be':
  Fix battery detail issues with "Android OS"
 2015-07-24 03:26:30 +00:00
Jason Monk
c19eac29b6 am 9b6ff57e: am a119087b: am 9927acd3: Merge "Don\'t show disabled apps in ignore optimizations" into mnc-dev 
* commit '9b6ff57eb550215c30a16225e59a2c4d0af7de92':
  Don't show disabled apps in ignore optimizations
 2015-07-24 03:26:29 +00:00
Guang Zhu
5ea94a9c4d am b91da24d: am 402c866c: am c1bef743: Prevent monkey from changing adoptable storage settings 
* commit 'b91da24db774829315087af3af09c90e89f496cb':
  Prevent monkey from changing adoptable storage settings
 2015-07-24 03:26:26 +00:00
Pavel Zhamaitsiak
ff381a20ca am a20eaca1: am bdc3fc36: am d9e0ed1b: Merge "Add or remove WFC setting when Wireless settings activity is resumed" into mnc-dev 
* commit 'a20eaca1a68138e1077af72bca7f6e76f4332abe':
  Add or remove WFC setting when Wireless settings activity is resumed
 2015-07-24 03:26:25 +00:00
Jason Monk
0557f4c353 am b46b9934: am 6d8fdb82: am 838c8432: Merge "Remove tuner from development settings" into mnc-dev 
* commit 'b46b9934037ce8801acd6582f26200ee952ddc68':
  Remove tuner from development settings
 2015-07-24 03:26:23 +00:00
Maurice Lam
f16673bab6 am 36c76014: Merge "[Fingerprint] Show skip button during SUW" into mnc-dev 
* commit '36c760140900b2bc6aa2c7287199dae4ca86c568':
  [Fingerprint] Show skip button during SUW
 2015-07-24 03:17:43 +00:00
Geoff Mendal
13cd0b2573 am f305e853: (-s ours) am 5376d54e: (-s ours) Import translations. DO NOT MERGE 
* commit 'f305e853a97be420eca536a510d8dca1c9877ef9':
  Import translations. DO NOT MERGE
 2015-07-24 03:13:06 +00:00
Geoff Mendal
cb113be57e am 28718aeb: (-s ours) Import translations. DO NOT MERGE 
* commit '28718aebd187fe68cf923422cde80103b0f6cbca':
  Import translations. DO NOT MERGE
 2015-07-24 03:13:04 +00:00
Svetoslav Ganov
1fa5f4b336 am 6c2d4d73: am cce844a7: Merge "Reset permissions and app links when clearing app preferences - settings" into mnc-dev 
* commit '6c2d4d73464e6026f42a615c75e3c5d7e3679d7b':
  Reset permissions and app links when clearing app preferences - settings
 2015-07-24 03:10:41 +00:00
Jason Monk
e9b9736415 am 14983fc6: am 8bf5f307: Merge "Fix battery detail issues with "Android OS"" into mnc-dev 
* commit '14983fc6646c4012f89903ad76567f53a4b919ba':
  Fix battery detail issues with "Android OS"
 2015-07-24 03:10:07 +00:00
Jason Monk
9b6ff57eb5 am a119087b: am 9927acd3: Merge "Don\'t show disabled apps in ignore optimizations" into mnc-dev 
* commit 'a119087b8ba24e930d982c30a039f7c4204fc435':
  Don't show disabled apps in ignore optimizations
 2015-07-24 03:10:05 +00:00
Maurice Lam
36c7601409 Merge "[Fingerprint] Show skip button during SUW" into mnc-dev 2015-07-24 03:08:29 +00:00
Guang Zhu
b91da24db7 am 402c866c: am c1bef743: Prevent monkey from changing adoptable storage settings 
* commit '402c866c3117571ddb66614fdbf963e8564a3232':
  Prevent monkey from changing adoptable storage settings
 2015-07-24 03:03:26 +00:00
Pavel Zhamaitsiak
a20eaca1a6 am bdc3fc36: am d9e0ed1b: Merge "Add or remove WFC setting when Wireless settings activity is resumed" into mnc-dev 
* commit 'bdc3fc3672df250ea3fd3c8a3b73048ebc232ad4':
  Add or remove WFC setting when Wireless settings activity is resumed
 2015-07-24 03:03:24 +00:00
Jason Monk
b46b993403 am 6d8fdb82: am 838c8432: Merge "Remove tuner from development settings" into mnc-dev 
* commit '6d8fdb829452a28af0c6c6bd253eb488abb4f770':
  Remove tuner from development settings
 2015-07-24 03:03:23 +00:00
Geoff Mendal
f305e853a9 am 5376d54e: (-s ours) Import translations. DO NOT MERGE 
* commit '5376d54e8eccc45586e5225b6ec7d6637399270f':
  Import translations. DO NOT MERGE
 2015-07-24 01:40:16 +00:00
Geoff Mendal
28718aebd1 Import translations. DO NOT MERGE 
Change-Id: I52c34f9ee160ac6f8ce81d8922a6d363ca0f348f
Auto-generated-cl: translation import
 2015-07-23 18:23:19 -07:00
Geoff Mendal
5376d54e8e Import translations. DO NOT MERGE 
Change-Id: I04098c09a5a3a63bb7109b0a3d064eaeed0cf1e2
Auto-generated-cl: translation import
 2015-07-23 18:10:24 -07:00
Selim Cinek
b48e9fdcab Adapted a string in the fingerprint enrollment flow 
Bug: 22634070
Change-Id: Ieefae6a6d23c22ea6719ccf8d843638bc92b4376
 2015-07-23 15:29:01 -07:00
Svetoslav Ganov
6c2d4d7346 am cce844a7: Merge "Reset permissions and app links when clearing app preferences - settings" into mnc-dev 
* commit 'cce844a7a31c4aec0770c40c7a9a805cb48b9f31':
  Reset permissions and app links when clearing app preferences - settings
 2015-07-23 21:56:56 +00:00
Svetoslav Ganov
cce844a7a3 Merge "Reset permissions and app links when clearing app preferences - settings" into mnc-dev 2015-07-23 21:47:10 +00:00
Jason Monk
14983fc664 am 8bf5f307: Merge "Fix battery detail issues with "Android OS"" into mnc-dev 
* commit '8bf5f3075e6e0797e96a861330b7ff82eee88bee':
  Fix battery detail issues with "Android OS"
 2015-07-23 20:32:34 +00:00
Jason Monk
a119087b8b am 9927acd3: Merge "Don\'t show disabled apps in ignore optimizations" into mnc-dev 
* commit '9927acd3ad67ce2cc20e9f9c06af442f6ba69c8f':
  Don't show disabled apps in ignore optimizations
 2015-07-23 20:32:32 +00:00
Jason Monk
8bf5f3075e Merge "Fix battery detail issues with "Android OS"" into mnc-dev 2015-07-23 20:23:57 +00:00
Jason Monk
9927acd3ad Merge "Don't show disabled apps in ignore optimizations" into mnc-dev 2015-07-23 20:23:09 +00:00
Maurice Lam
cff4eb9b73 am ea0f0fdf: am 7a335113: am 9b6bd390: am 32b96646: Merge "[ScreenLock] Style encryption interstitial in SUW" into mnc-dev 
* commit 'ea0f0fdfa2ad7f4fce34095e9b357b6b74052ba0':
  [ScreenLock] Style encryption interstitial in SUW
 2015-07-23 20:09:28 +00:00
Maurice Lam
3b798650fc am 06dc5930: am 705def9a: am f1fbf9cc: am 3c1f46dc: Merge "[Fingerprint] Send RESULT_CANCELED when back from Add another" into mnc-dev 
* commit '06dc59305fa7e0f72245471763843dcb8997f4e0':
  [Fingerprint] Send RESULT_CANCELED when back from Add another
 2015-07-23 20:09:27 +00:00
Maurice Lam
3f7ff2b60f am 391e65e4: am a5fa39dd: am ad904de8: am e44ceed1: Merge "[ScreenLock] Update illustration during setup wizard" into mnc-dev 
* commit '391e65e46594553515036cff019c9faaa2f2faf5':
  [ScreenLock] Update illustration during setup wizard
 2015-07-23 20:09:26 +00:00
Maurice Lam
ea0f0fdfa2 am 7a335113: am 9b6bd390: am 32b96646: Merge "[ScreenLock] Style encryption interstitial in SUW" into mnc-dev 
* commit '7a33511397e1f69bbb920dd64a6544f65557ea44':
  [ScreenLock] Style encryption interstitial in SUW
 2015-07-23 19:46:31 +00:00
Maurice Lam
06dc59305f am 705def9a: am f1fbf9cc: am 3c1f46dc: Merge "[Fingerprint] Send RESULT_CANCELED when back from Add another" into mnc-dev 
* commit '705def9a227fb19290308a815049e75f62005bee':
  [Fingerprint] Send RESULT_CANCELED when back from Add another
 2015-07-23 19:46:29 +00:00
Maurice Lam
391e65e465 am a5fa39dd: am ad904de8: am e44ceed1: Merge "[ScreenLock] Update illustration during setup wizard" into mnc-dev 
* commit 'a5fa39dd13552886ebe9903fcbd6084a9521fd16':
  [ScreenLock] Update illustration during setup wizard
 2015-07-23 19:46:28 +00:00
Guang Zhu
402c866c31 am c1bef743: Prevent monkey from changing adoptable storage settings 
* commit 'c1bef7430e1c49b9c3b2312328d3600261109ee8':
  Prevent monkey from changing adoptable storage settings
 2015-07-23 19:32:40 +00:00
Maurice Lam
7a33511397 am 9b6bd390: am 32b96646: Merge "[ScreenLock] Style encryption interstitial in SUW" into mnc-dev 
* commit '9b6bd390f97e2c9852d0a6e1ec8f7359a6492f3e':
  [ScreenLock] Style encryption interstitial in SUW
 2015-07-23 19:18:51 +00:00
Maurice Lam
705def9a22 am f1fbf9cc: am 3c1f46dc: Merge "[Fingerprint] Send RESULT_CANCELED when back from Add another" into mnc-dev 
* commit 'f1fbf9cca44d8a16bc1af92964558cf91ac00161':
  [Fingerprint] Send RESULT_CANCELED when back from Add another
 2015-07-23 19:18:50 +00:00
Maurice Lam
a5fa39dd13 am ad904de8: am e44ceed1: Merge "[ScreenLock] Update illustration during setup wizard" into mnc-dev 
* commit 'ad904de84644ab72754fe7d0cc5a34d1928c03f1':
  [ScreenLock] Update illustration during setup wizard
 2015-07-23 19:18:48 +00:00
Pavel Zhamaitsiak
bdc3fc3672 am d9e0ed1b: Merge "Add or remove WFC setting when Wireless settings activity is resumed" into mnc-dev 
* commit 'd9e0ed1b3e8d1584496d041a1081aaea9fdc7d41':
  Add or remove WFC setting when Wireless settings activity is resumed
 2015-07-23 19:13:06 +00:00
Jason Monk
6d8fdb8294 am 838c8432: Merge "Remove tuner from development settings" into mnc-dev 
* commit '838c843217c76418e5f65b38f40e6b39760de1e4':
  Remove tuner from development settings
 2015-07-23 19:13:05 +00:00
Guang Zhu
c1bef7430e Prevent monkey from changing adoptable storage settings 
Bug: 22423188
Change-Id: I36c798574c933b0339fad46af81b87a93ccea07b
 2015-07-23 10:57:59 -07:00
Pavel Zhamaitsiak
d9e0ed1b3e Merge "Add or remove WFC setting when Wireless settings activity is resumed" into mnc-dev 2015-07-23 16:54:55 +00:00
Svet Ganov
841bb3d336 Reset permissions and app links when clearing app preferences - settings 
bug:22359132

Change-Id: I55044a3fd1f8959a2a48cfd02276a24b2f619eb0
 2015-07-23 09:40:16 -07:00
Pavel Zhamaitsiak
3e7e2c57d4 Add or remove WFC setting when Wireless settings activity is resumed 
WFC availability changes when SIM is inserted/removed. Settings
should be updated if this has happened.

Bug: 22642035
Change-Id: I361748440033e703b771175aa79767c53f0da458
 2015-07-23 09:31:58 -07:00
Maurice Lam
5f8d7dbe52 [Fingerprint] Show skip button during SUW 
Show a skip button during enrolling in case the user entered the flow
accidentally. The skip button will send the result code RESULT_SKIP,
which is equal to RESULT_FIRST_USER + 1, back to the starting
activity.

Bug: 22666389
Change-Id: I230b04e5150214c31536ac282d56b7b490c85ac1
 2015-07-22 16:51:47 -07:00
Maurice Lam
9b6bd390f9 am 32b96646: Merge "[ScreenLock] Style encryption interstitial in SUW" into mnc-dev 
* commit '32b96646eec917987fdd38208c6b11a9bc8832d3':
  [ScreenLock] Style encryption interstitial in SUW
 2015-07-22 20:23:18 +00:00
Maurice Lam
f1fbf9cca4 am 3c1f46dc: Merge "[Fingerprint] Send RESULT_CANCELED when back from Add another" into mnc-dev 
* commit '3c1f46dc2c3d6b0a9c0c39d0cc327380a3f8f078':
  [Fingerprint] Send RESULT_CANCELED when back from Add another
 2015-07-22 20:23:17 +00:00
Maurice Lam
ad904de846 am e44ceed1: Merge "[ScreenLock] Update illustration during setup wizard" into mnc-dev 
* commit 'e44ceed122aa06482bf03d58eba91536a29e4158':
  [ScreenLock] Update illustration during setup wizard
 2015-07-22 20:23:15 +00:00