PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
21,292 Commits 1 Branch 0 Tags
c9607b39f8e34b1091f28a27c47fb4dc408fd57c
Commit Graph

21292 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
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
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
Jason Monk
838c843217 Merge "Remove tuner from development settings" into mnc-dev 2015-07-22 19:29:59 +00:00
Geoff Mendal
655698be8e am 741f3665: (-s ours) am 0a167c40: (-s ours) Import translations. DO NOT MERGE 
* commit '741f3665dbd543ebd9abe0e9e3258ecbd07fa209':
  Import translations. DO NOT MERGE
 2015-07-22 14:25:13 +00:00
Jason Monk
82f30d2a41 Fix battery detail issues with "Android OS" 
Bug: 22638215
Change-Id: Ia5bab7eb3bfb964e7f914e8c8f392f4fea66eb29
 2015-07-22 10:12:05 -04:00
Geoff Mendal
741f3665db am 0a167c40: (-s ours) Import translations. DO NOT MERGE 
* commit '0a167c400af710fe97d7491abdffbe54bec42761':
  Import translations. DO NOT MERGE
 2015-07-22 14:10:23 +00:00
Geoff Mendal
0a167c400a Import translations. DO NOT MERGE 
Change-Id: Iee7522d01901078d3a091eb4a6e9175e664e99e2
Auto-generated-cl: translation import
 2015-07-22 06:59:04 -07:00
Maurice Lam
32b96646ee Merge "[ScreenLock] Style encryption interstitial in SUW" into mnc-dev 2015-07-21 23:40:02 +00:00
Maurice Lam
3c1f46dc2c Merge "[Fingerprint] Send RESULT_CANCELED when back from Add another" into mnc-dev 2015-07-21 23:39:35 +00:00
Maurice Lam
e44ceed122 Merge "[ScreenLock] Update illustration during setup wizard" into mnc-dev 2015-07-21 23:38:34 +00:00
Maurice Lam
da433902d4 [Fingerprint] Send RESULT_CANCELED when back from Add another 
Forward the result in the enrolling screen from the finish screen,
so that if the user presses back in "Add another" after enrolling
the first fingerprint, it will return RESULT_CANCELED instead of
RESULT_FINISHED, and go back to find sensor screen.

This results in the following behavioral changes:
- RESULT_FINISHED will only be sent if the user presses "Done" in
  FingerprintEnrollFinish. If the user clicks back in
  FingerprintEnrollEnrolling, they will always go back to the
  previous screen with RESULT_CANCELED, which would either be
  FindSensor or FingerprintSettings.
- If the user presses back in FingerprintEnrollFinish, which is only
  possible outside of Setup Wizard, they will be back in Find Sensor,
  and pressing next will enroll an additional fingerprint.
  - Edge case: if the user enrolled the maximum number of
    fingerprints, and presses back, they will be bounced all the way
    back to Settings > Security.

Bug: 22552741
Change-Id: Ifc5e8a9150491b4303e01ebd0fc17b6d39dd372d
 2015-07-21 15:23:11 -07:00
Billy Lau
f7011298ed am bc3695c2: am e267fb31: am d06ba151: Merge "Bug 21589105 Rescope WRITE_SETTINGS (UX and Settings app change)..." into mnc-dev 
* commit 'bc3695c231a5a16f45059e0e561a35d49353afc5':
  Bug 21589105 Rescope WRITE_SETTINGS (UX and Settings app change)...
 2015-07-21 18:21:45 +00:00
Billy Lau
bc3695c231 am e267fb31: am d06ba151: Merge "Bug 21589105 Rescope WRITE_SETTINGS (UX and Settings app change)..." into mnc-dev 
* commit 'e267fb3119754f205bf8518a6c00d3e957b0e45f':
  Bug 21589105 Rescope WRITE_SETTINGS (UX and Settings app change)...
 2015-07-21 18:06:42 +00:00
Billy Lau
e267fb3119 am d06ba151: Merge "Bug 21589105 Rescope WRITE_SETTINGS (UX and Settings app change)..." into mnc-dev 
* commit 'd06ba151f5cc966bf05b2ac0146602d31ae81c4a':
  Bug 21589105 Rescope WRITE_SETTINGS (UX and Settings app change)...
 2015-07-21 17:54:00 +00:00
Billy Lau
d06ba151f5 Merge "Bug 21589105 Rescope WRITE_SETTINGS (UX and Settings app change)..." into mnc-dev 2015-07-21 17:37:08 +00:00
Amit Mahajan
a38dfb03c4 am c5459430: am 480692fa: am e8357caa: Merge "Fix bug to force to close once change Bearer on APN" into mnc-dev 
* commit 'c5459430a08351544e6545a16aa07147b186ec7b':
  Fix bug to force to close once change Bearer on APN
 2015-07-21 17:30:59 +00:00
Amit Mahajan
c5459430a0 am 480692fa: am e8357caa: Merge "Fix bug to force to close once change Bearer on APN" into mnc-dev 
* commit '480692fab398a080be6648ddf424b3129f2c6cbc':
  Fix bug to force to close once change Bearer on APN
 2015-07-21 17:17:45 +00:00
Amit Mahajan
480692fab3 am e8357caa: Merge "Fix bug to force to close once change Bearer on APN" into mnc-dev 
* commit 'e8357caad8880deb23dc04ad5d4d036d41a1ae9f':
  Fix bug to force to close once change Bearer on APN
 2015-07-21 17:09:12 +00:00
Amit Mahajan
e8357caad8 Merge "Fix bug to force to close once change Bearer on APN" into mnc-dev 2015-07-21 16:57:13 +00:00
Billy Lau
bb3aa2632a Bug 21589105 Rescope WRITE_SETTINGS (UX and Settings app change)... 
Overall, fixed the detection of the state of permission in the corresponding
UX to be more accurate. Also ensured that apps needing this capability can
launch the summary UX through a specific intent.

AndroidManifest:
Adds the proper intent-filter so that apps can launch the Settings page using
intent.

strings.xml:
Increased the CHAR limits for some strings due to requests from translators.

Change-Id: Ie64f86e034867ed582c1c583a5e8f84671fa4d63
 2015-07-21 17:44:49 +01:00
Julia Reynolds
3d94772b08 am 6712be4a: am d409b700: am f516e7dd: Make \'fingerprint\' searchable in Settings. 
* commit '6712be4a70ecd9d21ae78bf7dc65afc92b277937':
  Make 'fingerprint' searchable in Settings.
 2015-07-21 15:57:46 +00:00
Julia Reynolds
6712be4a70 am d409b700: am f516e7dd: Make \'fingerprint\' searchable in Settings. 
* commit 'd409b70093211df215bc117ccf9ba8d0924e983f':
  Make 'fingerprint' searchable in Settings.
 2015-07-21 15:44:21 +00:00
Julia Reynolds
d409b70093 am f516e7dd: Make \'fingerprint\' searchable in Settings. 
* commit 'f516e7dde0074416dbf51650cbfb9cc763027b27':
  Make 'fingerprint' searchable in Settings.
 2015-07-21 15:31:17 +00:00