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

21392 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jim Miller
64117fef33 am 4b3bc882: am bf9a425d: Merge "Simplify FingerprintSettings" into mnc-dev 
* commit '4b3bc882ad2824a1f7d4362d8757ddb9c7ba21ce':
  Simplify FingerprintSettings
 2015-07-17 21:30:11 +00:00
Jim Miller
4b3bc882ad am bf9a425d: Merge "Simplify FingerprintSettings" into mnc-dev 
* commit 'bf9a425d5c3f61f02133084d11ab8481b0f53102':
  Simplify FingerprintSettings
 2015-07-17 21:15:57 +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
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
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
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
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
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
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
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
a4dfe05b29 am 543d68cc: am 194e92d3: am 50972605: Merge "Disable ignore battery optimization items that can\'t change" into mnc-dev 
* commit '543d68cc3a68098bface7335266a46d1ae0603ca':
  Disable ignore battery optimization items that can't change
 2015-07-15 23:30:21 +00:00
Jason Monk
5d780aa921 am f9d8deff: am 7beb763d: am 4a6b9095: Merge "Change move storage from dropdown pref to dialog" into mnc-dev 
* commit 'f9d8deffaa79da57f04c9eed50d0d1991daac4b1':
  Change move storage from dropdown pref to dialog
 2015-07-15 23:30:19 +00:00
Jason Monk
543d68cc3a am 194e92d3: am 50972605: Merge "Disable ignore battery optimization items that can\'t change" into mnc-dev 
* commit '194e92d3a0dcc15056fac17690f2f36bdc96861a':
  Disable ignore battery optimization items that can't change
 2015-07-15 23:20:43 +00:00
Jason Monk
f9d8deffaa am 7beb763d: am 4a6b9095: Merge "Change move storage from dropdown pref to dialog" into mnc-dev 
* commit '7beb763da239fb71f214cab0587ae52f383985fc':
  Change move storage from dropdown pref to dialog
 2015-07-15 23:20:41 +00:00
Jason Monk
194e92d3a0 am 50972605: Merge "Disable ignore battery optimization items that can\'t change" into mnc-dev 
* commit '509726054a3efc09d65d6c15f485ea6f1da2d272':
  Disable ignore battery optimization items that can't change
 2015-07-15 23:03:58 +00:00
Jason Monk
7beb763da2 am 4a6b9095: Merge "Change move storage from dropdown pref to dialog" into mnc-dev 
* commit '4a6b909559d50e02833afd5119876df070dfd458':
  Change move storage from dropdown pref to dialog
 2015-07-15 23:03:57 +00:00
Jason Monk
509726054a Merge "Disable ignore battery optimization items that can't change" into mnc-dev 2015-07-15 22:48:13 +00:00
Jason Monk
4a6b909559 Merge "Change move storage from dropdown pref to dialog" into mnc-dev 2015-07-15 22:48:06 +00:00
Maurice Lam
3603d8ad82 am 2ea2950d: am 77352c65: am 4595978b: Merge "[Fingerprint] Add fingerprint enroll in setup wizard" into mnc-dev 
* commit '2ea2950d9c15e2da38d5aece8de7c0079539d99a':
  [Fingerprint] Add fingerprint enroll in setup wizard
 2015-07-15 22:47:19 +00:00
Jim Miller
ab5cdb2f4d am 593fe777: am 22e51c8b: am 6b9d7889: Merge "Fixed the layout for the fingerprint renaming" into mnc-dev 
* commit '593fe7778cde419f73d3ec331d028bd86a4f442b':
  Fixed the layout for the fingerprint renaming
 2015-07-15 22:47:18 +00:00
Maurice Lam
dfe3368bf6 am 649215a5: am e63322f6: resolved conflicts for merge of f90628c6 to mnc-dr-dev 
* commit '649215a50c65b512b51cd21b54e479cd4ff3b926':
  [Fingerprint] Export FingerprintEnrollIntroduction
 2015-07-15 22:47:17 +00:00
Maurice Lam
2ea2950d9c am 77352c65: am 4595978b: Merge "[Fingerprint] Add fingerprint enroll in setup wizard" into mnc-dev 
* commit '77352c65be3d4106da93609794610d88347e069b':
  [Fingerprint] Add fingerprint enroll in setup wizard
 2015-07-15 22:32:46 +00:00
Jim Miller
593fe7778c am 22e51c8b: am 6b9d7889: Merge "Fixed the layout for the fingerprint renaming" into mnc-dev 
* commit '22e51c8b4f6622cc160d8652b8abe9db304b9a5a':
  Fixed the layout for the fingerprint renaming
 2015-07-15 22:32:45 +00:00
Maurice Lam
649215a50c am e63322f6: resolved conflicts for merge of f90628c6 to mnc-dr-dev 
* commit 'e63322f640cf955ba296e064b07e4920d334f851':
  [Fingerprint] Export FingerprintEnrollIntroduction
 2015-07-15 22:32:43 +00:00
Maurice Lam
77352c65be am 4595978b: Merge "[Fingerprint] Add fingerprint enroll in setup wizard" into mnc-dev 
* commit '4595978b72eda7ed53ce0c0cbb763bed02ea13ab':
  [Fingerprint] Add fingerprint enroll in setup wizard
 2015-07-15 22:26:51 +00:00
Jim Miller
22e51c8b4f am 6b9d7889: Merge "Fixed the layout for the fingerprint renaming" into mnc-dev 
* commit '6b9d788914a600917e8edd4ecd502d6ccf87ca12':
  Fixed the layout for the fingerprint renaming
 2015-07-15 22:26:50 +00:00
Maurice Lam
e63322f640 resolved conflicts for merge of f90628c6 to mnc-dr-dev 
Change-Id: I3b0729b1d00a4ca25d3a7127e27b4fc3a062d30d
 2015-07-15 14:57:06 -07:00
Jason Monk
e8400c2fb7 Change move storage from dropdown pref to dialog 
Use a horizontal pref and a single button that triggers the dialog

Bug: 21922660
Change-Id: Ifb4de75ca9269d2e8163eec5602932260adec0d9
 2015-07-15 16:59:28 -04:00