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

22375 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jim Miller
4b3bc882ad am bf9a425d: Merge "Simplify FingerprintSettings" into mnc-dev 
* commit 'bf9a425d5c3f61f02133084d11ab8481b0f53102':
  Simplify FingerprintSettings
 2015-07-17 21:15:57 +00:00
Julia Reynolds
406b1b9f20 am 98f81284: am 03b1b4f3: am 8560ae2f: am 0c03b50a: Merge "Remove blank switchtext from switch preferences." into mnc-dev 
* commit '98f8128486d44defdd6cbda3346baceb6dc1c5f1':
  Remove blank switchtext from switch preferences.
 2015-07-17 21:07:35 +00:00
Jim Miller
bf9a425d5c Merge "Simplify FingerprintSettings" into mnc-dev 2015-07-17 21:05:07 +00:00
Jim Miller
8e83475024 Simplify FingerprintSettings 
There's no need for FingerprintSettings to retry fingerprint
any more often than these cases: 1. authentication success,
2. authentication error and 3. when the activity resumes.

Fixes bug 22438498

Change-Id: I87841e9916cfc9e6c64cd1df009b9a9c765f87d0
 2015-07-17 21:03:42 +00:00
Julia Reynolds
98f8128486 am 03b1b4f3: am 8560ae2f: am 0c03b50a: Merge "Remove blank switchtext from switch preferences." into mnc-dev 
* commit '03b1b4f33f9101d95f0e881ffebec24a99498eb0':
  Remove blank switchtext from switch preferences.
 2015-07-17 20:53:54 +00:00
Julia Reynolds
03b1b4f33f am 8560ae2f: am 0c03b50a: Merge "Remove blank switchtext from switch preferences." into mnc-dev 
* commit '8560ae2f8752f611ffee651289519a7993b3e500':
  Remove blank switchtext from switch preferences.
 2015-07-17 20:40:19 +00:00
Julia Reynolds
8560ae2f87 am 0c03b50a: Merge "Remove blank switchtext from switch preferences." into mnc-dev 
* commit '0c03b50a02007499208603733e597f72aa9a59c2':
  Remove blank switchtext from switch preferences.
 2015-07-17 20:27:24 +00:00
Julia Reynolds
0c03b50a02 Merge "Remove blank switchtext from switch preferences." into mnc-dev 2015-07-17 20:11:27 +00:00
Billy Lau
6897d6978e am 81e050aa: am 28f35248: am e5a95396: am e104fced: am 90a8a01b: Merge "Bug 21589105 Rescope SYSTEM_ALERT_WINDOW (UX and Settings app change)..." into mnc-dev 
* commit '81e050aad01c15484fe4e262c53475bd13c4782b':
  Bug 21589105 Rescope SYSTEM_ALERT_WINDOW (UX and Settings app change)...
 2015-07-17 19:52:38 +00:00
Billy Lau
81e050aad0 am 28f35248: am e5a95396: am e104fced: am 90a8a01b: Merge "Bug 21589105 Rescope SYSTEM_ALERT_WINDOW (UX and Settings app change)..." into mnc-dev 
* commit '28f352483e2951339627be1867562cd4ca99f66e':
  Bug 21589105 Rescope SYSTEM_ALERT_WINDOW (UX and Settings app change)...
 2015-07-17 19:29:21 +00:00
Billy Lau
28f352483e am e5a95396: am e104fced: am 90a8a01b: Merge "Bug 21589105 Rescope SYSTEM_ALERT_WINDOW (UX and Settings app change)..." into mnc-dev 
* commit 'e5a95396da082a3ba432c5d8ed5a7baa2eacd55c':
  Bug 21589105 Rescope SYSTEM_ALERT_WINDOW (UX and Settings app change)...
 2015-07-17 19:09:06 +00:00
Billy Lau
e5a95396da am e104fced: am 90a8a01b: Merge "Bug 21589105 Rescope SYSTEM_ALERT_WINDOW (UX and Settings app change)..." into mnc-dev 
* commit 'e104fced18056905286ee01a3ef8c3d12f2b9e4d':
  Bug 21589105 Rescope SYSTEM_ALERT_WINDOW (UX and Settings app change)...
 2015-07-17 18:57:51 +00:00
Billy Lau
e104fced18 am 90a8a01b: Merge "Bug 21589105 Rescope SYSTEM_ALERT_WINDOW (UX and Settings app change)..." into mnc-dev 
* commit '90a8a01b629694d28dd7e40a8f0253894fc14e02':
  Bug 21589105 Rescope SYSTEM_ALERT_WINDOW (UX and Settings app change)...
 2015-07-17 18:39:23 +00:00
Billy Lau
90a8a01b62 Merge "Bug 21589105 Rescope SYSTEM_ALERT_WINDOW (UX and Settings app change)..." into mnc-dev 2015-07-17 18:28:28 +00:00
Billy Lau
f8f9802104 Bug 21589105 Rescope SYSTEM_ALERT_WINDOW (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 can actually launch the summary UX
through a custom intent.

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

strings:
Made changes to strings so that wordings are uniform everywhere and raised the
char limit due to requests from translators.

Change-Id: Ia03403641ad53bd1a33b84dae6db1739cfcf9d60
 2015-07-17 18:23:57 +01:00
Daichi Hirono
5e76cdc9dd Turn the eject menu into a button. 
BUG=21897892

Change-Id: Icd0db7907b990447c99c4ae65816e85777df0f8e
 2015-07-17 15:26:15 +09:00
Christopher Tate
021c21816d am 0111096e: am 5c3f34b7: am b42eb5e2: am 649cc87f: am ddaa142a: Intent filters need CATEGORY_BROWSABLE to be app-linking eligible 
* commit '0111096eca186f771ed1cd65d10b9509d6b5ddec':
  Intent filters need CATEGORY_BROWSABLE to be app-linking eligible
 2015-07-17 00:40:50 +00:00
Christopher Tate
0111096eca am 5c3f34b7: am b42eb5e2: am 649cc87f: am ddaa142a: Intent filters need CATEGORY_BROWSABLE to be app-linking eligible 
* commit '5c3f34b7e5ce05d134e7ec907758641a8bdf1932':
  Intent filters need CATEGORY_BROWSABLE to be app-linking eligible
 2015-07-17 00:27:45 +00:00
Christopher Tate
5c3f34b7e5 am b42eb5e2: am 649cc87f: am ddaa142a: Intent filters need CATEGORY_BROWSABLE to be app-linking eligible 
* commit 'b42eb5e221b9120741f497cc94486dc804ab2cbb':
  Intent filters need CATEGORY_BROWSABLE to be app-linking eligible
 2015-07-17 00:17:06 +00:00
Christopher Tate
b42eb5e221 am 649cc87f: am ddaa142a: Intent filters need CATEGORY_BROWSABLE to be app-linking eligible 
* commit '649cc87f994c0010e8fd7567b7cece77ffffb0fd':
  Intent filters need CATEGORY_BROWSABLE to be app-linking eligible
 2015-07-17 00:04:04 +00:00
Christopher Tate
649cc87f99 am ddaa142a: Intent filters need CATEGORY_BROWSABLE to be app-linking eligible 
* commit 'ddaa142a094a404d7c5e6d7eea93920f8ed16696':
  Intent filters need CATEGORY_BROWSABLE to be app-linking eligible
 2015-07-16 23:50:06 +00:00
Christopher Tate
ddaa142a09 Intent filters need CATEGORY_BROWSABLE to be app-linking eligible 
Bug 22504009

Change-Id: I19ded70cf17936504a2a1becea2684d87952dff6
 2015-07-16 16:07:12 -07:00
Makoto Onuki
26cf58aba6 Fix ugly text wrapping on non-english locales 
Bug 22284618

Change-Id: Iaab017fa5d2f5aeb3457f911cbd31ceb8671e495
 2015-07-16 15:45:09 -07:00
Xiaohui Chen
8ae4680977 sys user split: update createUser method 
After the system user is split out, all users are more or less the same.
We combine the generic user and secondary user create method to reflect
this concept.  This also fixes the bug the newly created Primary user
from lock screen contains secondary user restrictions.

Bug: 19913735
Change-Id: I407a877c11346409bad85e00038f6cfd3d126da3
 2015-07-16 14:34:00 -07:00
Jason Monk
b1d9536e58 Remove tuner from development settings 
It has a new home now.

Bug: 22462605
Change-Id: Ibf07a63db14579d07b09d5150b7d04cf138f3b78
 2015-07-16 16:41:15 -04:00
Xiaohui Chen
33b17beb9d Merge "sys user split: fix user settings user list" 2015-07-16 17:46:08 +00:00
Julia Reynolds
16eec50576 Remove blank switchtext from switch preferences. 
This makes TTS services read the default text (on/off) when
these switches are toggled.

Bug: 22530662
Change-Id: I77c5918481faa6309995aa385dcfc3608fc94298
 2015-07-16 13:28:16 -04:00
Kenny Guy
2a9b911a85 am 32b5ec83: am dbb975f8: am 00a82a4e: am 29d1b0d0: am 705faddb: Merge "Show disabled trust agents as off." into mnc-dev 
* commit '32b5ec834adfd5a14eaca23ece62aecfab143baa':
  Show disabled trust agents as off.
 2015-07-16 17:17:34 +00:00
Xiaohui Chen
148ef7795d sys user split: fix user settings user list 
Only end user switchable users should show up in this list.

BUG:19913735
Change-Id: Ifb83f159864f2210d779b5831c5a5c4dc5e6f4bb
 2015-07-16 10:09:37 -07:00
Xiaohui Chen
c49c26bf04 Merge "sys user split: refactor user settings" 2015-07-16 16:16:20 +00:00
Kenny Guy
32b5ec834a am dbb975f8: am 00a82a4e: am 29d1b0d0: am 705faddb: Merge "Show disabled trust agents as off." into mnc-dev 
* commit 'dbb975f8a0dc77bbfa9578a3a394de9cbe08d7cd':
  Show disabled trust agents as off.
 2015-07-16 13:42:00 +00:00
Kenny Guy
dbb975f8a0 am 00a82a4e: am 29d1b0d0: am 705faddb: Merge "Show disabled trust agents as off." into mnc-dev 
* commit '00a82a4e1b125a25ec3c92e90dbc3de986124813':
  Show disabled trust agents as off.
 2015-07-16 13:30:00 +00:00
Kenny Guy
00a82a4e1b am 29d1b0d0: am 705faddb: Merge "Show disabled trust agents as off." into mnc-dev 
* commit '29d1b0d0f4e7760ee1ed317b303a6c4ec54adda7':
  Show disabled trust agents as off.
 2015-07-16 13:15:57 +00:00
Kenny Guy
29d1b0d0f4 am 705faddb: Merge "Show disabled trust agents as off." into mnc-dev 
* commit '705faddbb37bbaa8dc7a18ab3290c02b5b6a2a2c':
  Show disabled trust agents as off.
 2015-07-16 13:02:44 +00:00
Kenny Guy
705faddbb3 Merge "Show disabled trust agents as off." into mnc-dev 2015-07-16 12:42:41 +00:00
Sanket Padawe
423a891b38 am 45c5de2f: am e07fce2c: am 18c31082: am c5be2243: am 046decca: Merge "Use common xml file for multi-tab settings." into mnc-dev 
* commit '45c5de2f62bcdea70a5f25f60ab10398f5911574':
  Use common xml file for multi-tab settings.
 2015-07-16 06:02:20 +00:00
Sanket Padawe
45c5de2f62 am e07fce2c: am 18c31082: am c5be2243: am 046decca: Merge "Use common xml file for multi-tab settings." into mnc-dev 
* commit 'e07fce2c3bde8c8fd5c380a0a524378d0d99e092':
  Use common xml file for multi-tab settings.
 2015-07-16 05:48:44 +00:00
Sanket Padawe
e07fce2c3b am 18c31082: am c5be2243: am 046decca: Merge "Use common xml file for multi-tab settings." into mnc-dev 
* commit '18c31082b397858564f1dc99a785dc77d1814151':
  Use common xml file for multi-tab settings.
 2015-07-16 05:40:25 +00:00
Sanket Padawe
18c31082b3 am c5be2243: am 046decca: Merge "Use common xml file for multi-tab settings." into mnc-dev 
* commit 'c5be2243d79ea0a27a7c61ee3aeffdacd7f63b06':
  Use common xml file for multi-tab settings.
 2015-07-16 05:27:44 +00:00
Sanket Padawe
c5be2243d7 am 046decca: Merge "Use common xml file for multi-tab settings." into mnc-dev 
* commit '046decca29376aba5b97b78900bfd867ca3f310c':
  Use common xml file for multi-tab settings.
 2015-07-16 05:14:09 +00:00
Sanket Padawe
046decca29 Merge "Use common xml file for multi-tab settings." into mnc-dev 2015-07-16 05:01:27 +00:00
Maurice Lam
2632b5946b am 1e83db94: am 037ec868: am 85f199d8: am 021b3d95: am bec1d295: Merge "[Fingerprint] Use accent color for fingerprint highlight" into mnc-dev 
* commit '1e83db942671f4efb28cc1d2d0820649bac7cf66':
  [Fingerprint] Use accent color for fingerprint highlight
 2015-07-16 03:23:26 +00:00
Maurice Lam
1e83db9426 am 037ec868: am 85f199d8: am 021b3d95: am bec1d295: Merge "[Fingerprint] Use accent color for fingerprint highlight" into mnc-dev 
* commit '037ec86847055f57fa98db71c7b30ae3030ff16d':
  [Fingerprint] Use accent color for fingerprint highlight
 2015-07-16 03:10:26 +00:00
Maurice Lam
037ec86847 am 85f199d8: am 021b3d95: am bec1d295: Merge "[Fingerprint] Use accent color for fingerprint highlight" into mnc-dev 
* commit '85f199d8620c689ae6f0ae94eeda9168fa93c2db':
  [Fingerprint] Use accent color for fingerprint highlight
 2015-07-16 02:57:00 +00:00
Maurice Lam
85f199d862 am 021b3d95: am bec1d295: Merge "[Fingerprint] Use accent color for fingerprint highlight" into mnc-dev 
* commit '021b3d955f91eeaa03f8f45401663954560dc748':
  [Fingerprint] Use accent color for fingerprint highlight
 2015-07-16 02:43:11 +00:00
Maurice Lam
021b3d955f am bec1d295: Merge "[Fingerprint] Use accent color for fingerprint highlight" into mnc-dev 
* commit 'bec1d295586b752f81f523c8339dcd49c586d722':
  [Fingerprint] Use accent color for fingerprint highlight
 2015-07-16 02:28:09 +00:00
Maurice Lam
bec1d29558 Merge "[Fingerprint] Use accent color for fingerprint highlight" into mnc-dev 2015-07-16 02:19:19 +00:00
Jason Monk
8dc988c811 am 6d2be9f2: am a4dfe05b: am 543d68cc: am 194e92d3: am 50972605: Merge "Disable ignore battery optimization items that can\'t change" into mnc-dev 
* commit '6d2be9f2043bbd1fb7e5afc44583c7cc80a7b1a0':
  Disable ignore battery optimization items that can't change
 2015-07-16 00:04:45 +00:00
Jason Monk
4904f3cbaf am bfa8e5d5: am 5d780aa9: am f9d8deff: am 7beb763d: am 4a6b9095: Merge "Change move storage from dropdown pref to dialog" into mnc-dev 
* commit 'bfa8e5d53b53a9accbf567f986b625c9ac473f35':
  Change move storage from dropdown pref to dialog
 2015-07-16 00:04:43 +00:00
Jason Monk
6d2be9f204 am a4dfe05b: am 543d68cc: am 194e92d3: am 50972605: Merge "Disable ignore battery optimization items that can\'t change" into mnc-dev 
* commit 'a4dfe05b29118055f9e8d4437655e2354cfb1dd7':
  Disable ignore battery optimization items that can't change
 2015-07-15 23:48:21 +00:00