PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
20,816 Commits 1 Branch 0 Tags
a3a245219a68f3201c43baf24f2fc72a38c1ff18
Commit Graph

20816 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jason Monk
5ab0c9c9e3 am a7fe759d: Merge "More memory updates" into mnc-dev 
* commit 'a7fe759de7c021b0d3467c75422acb14c62f90bd':
  More memory updates
 2015-05-28 14:33:50 +00:00
Jason Monk
a7fe759de7 Merge "More memory updates" into mnc-dev 2015-05-28 14:24:35 +00:00
Jason Monk
ab2046aa76 More memory updates 
- Some string changes
 - Make processes in memory details not clickable
 - Put processes in a 'detail' category
 - Hide processes when an app only has 1
 - Add memory item to bottom of app info page

Bug: 20694769
Change-Id: Ifbe2205aeef230e44752d075578524249b30bdf8
 2015-05-28 10:20:56 -04:00
John Spurlock
e2b5b7fd98 am 9dbd6165: Merge "Settings: Update icon sizes for zen auto rules." into mnc-dev 
* commit '9dbd616541de32df34562a4ee8cb8ee28757923c':
  Settings: Update icon sizes for zen auto rules.
 2015-05-28 14:18:41 +00:00
Jason Monk
ef4ec26032 am 15dcebe1: Help fallbacks and intent work 
* commit '15dcebe1e79ad396a08873f940e2f33d432cf387':
  Help fallbacks and intent work
 2015-05-28 14:18:38 +00:00
John Spurlock
9dbd616541 Merge "Settings: Update icon sizes for zen auto rules." into mnc-dev 2015-05-28 14:11:10 +00:00
John Spurlock
e6f9c110c7 Settings: Update icon sizes for zen auto rules. 
Bug: 21474291
Change-Id: I5f2ec0e86f9390ee9c73e4a1be6bc280162b1cab
 2015-05-28 10:07:29 -04:00
Jason Monk
15dcebe1e7 Help fallbacks and intent work 
- Handle a backup URI, so that if the specified URI is not available,
   another can be used.
 - Add some data to help intents when they are intent URIs
 - Fill in the context with a classname when it isn't present

Bug: 15475009
Change-Id: I7050fa61121901929e650b20bd7a0ae21e8ba207
 2015-05-28 09:50:45 -04:00
Sanket Padawe
d326f29cb6 am 479c5215: am 56eb3e61: am ecf4339b: Fix Eap method selection on screen rotation. 
* commit '479c5215e68145d7987953b8623fc653708ece07':
  Fix Eap method selection on screen rotation.
 2015-05-28 02:37:58 +00:00
Sanket Padawe
479c5215e6 am 56eb3e61: am ecf4339b: Fix Eap method selection on screen rotation. 
* commit '56eb3e611db35afb13b00bfa7b187d2d38eae942':
  Fix Eap method selection on screen rotation.
 2015-05-28 01:32:34 +00:00
Sanket Padawe
56eb3e611d am ecf4339b: Fix Eap method selection on screen rotation. 
* commit 'ecf4339bc74f8d4fb504e8f32b1d4828e9975e37':
  Fix Eap method selection on screen rotation.
 2015-05-28 01:23:47 +00:00
Sanket Padawe
ecf4339bc7 Fix Eap method selection on screen rotation. 
Bug: 19903254
Change-Id: I84322a785f9a4121c7885ada889a04129590e4ed
 2015-05-27 18:04:23 -07:00
Paul Lawrence
0d3a126855 am 177f3977: am 70aae38d: am 90e9a903: Merge "Honor password visible setting in CryptKeeper" into mnc-dev 
* commit '177f3977ddf9196df5f2092d215b52fe2535237b':
  Honor password visible setting in CryptKeeper
 2015-05-27 23:04:55 +00:00
Paul Lawrence
177f3977dd am 70aae38d: am 90e9a903: Merge "Honor password visible setting in CryptKeeper" into mnc-dev 
* commit '70aae38d3d80bf10a60ff2216e2f31e0b93ab34c':
  Honor password visible setting in CryptKeeper
 2015-05-27 22:48:05 +00:00
Paul Lawrence
70aae38d3d am 90e9a903: Merge "Honor password visible setting in CryptKeeper" into mnc-dev 
* commit '90e9a9031215ae40c058d3c2b7474f8eb28fde44':
  Honor password visible setting in CryptKeeper
 2015-05-27 22:31:19 +00:00
Paul Lawrence
90e9a90312 Merge "Honor password visible setting in CryptKeeper" into mnc-dev 2015-05-27 22:15:51 +00:00
Andres Morales
86166a4b2c am 02122f6a: am fb171c21: am 27c13e5d: Merge "[ConfirmCredential] fix issue where patterns of length 4 are not checked" into mnc-dev 
* commit '02122f6ab3825c14b0b47f82b76200083a5908ae':
  [ConfirmCredential] fix issue where patterns of length 4 are not checked
 2015-05-27 21:49:11 +00:00
Adrian Roos
7581c30774 Only show emergency app preference if enabled 
Bug: 21471480
Change-Id: I93e5dcb9acb8be1220d2874d5bca764819139760
 2015-05-27 14:39:24 -07:00
Andres Morales
02122f6ab3 am fb171c21: am 27c13e5d: Merge "[ConfirmCredential] fix issue where patterns of length 4 are not checked" into mnc-dev 
* commit 'fb171c214f905c20053f7ced9f981bccb8275b29':
  [ConfirmCredential] fix issue where patterns of length 4 are not checked
 2015-05-27 21:34:22 +00:00
Andres Morales
fb171c214f am 27c13e5d: Merge "[ConfirmCredential] fix issue where patterns of length 4 are not checked" into mnc-dev 
* commit '27c13e5dc6444be87af26e545e4e1163c3767ffc':
  [ConfirmCredential] fix issue where patterns of length 4 are not checked
 2015-05-27 21:15:56 +00:00
Chad Brubaker
c0e6d21601 am fdda3f5d: am 08ffcb99: am 227ba29e: Merge "Clear only keystore credential entires" into mnc-dev 
* commit 'fdda3f5dc79e6c7eba04b0304bff612c4e99a7d4':
  Clear only keystore credential entires
 2015-05-27 21:01:18 +00:00
Andres Morales
6f9e4a19ae am 6e3a182f: am 6042133f: am b5746cb1: Merge "[LockSettings] pipe through HW throttle timeout" into mnc-dev 
* commit '6e3a182f9b6d8fd442408bb2eb1baa868a2257d0':
  [LockSettings] pipe through HW throttle timeout
 2015-05-27 21:01:17 +00:00
Maurice Lam
a80694d476 am 2991c526: am 08b13b02: am 6fd26aae: Merge "[LockScreen] Setup Wizard pattern lock landscape layout" into mnc-dev 
* commit '2991c52600a15205e6ca0aac76e6e5b00149c23a':
  [LockScreen] Setup Wizard pattern lock landscape layout
 2015-05-27 21:01:15 +00:00
Jorim Jaggi
265c85c261 am 57aeea92: am 30ddbcdb: am fd5ec09f: Merge "Cancel enrollment when navigating out of enrollment" into mnc-dev 
* commit '57aeea920e06a8a192462e6b94a1fc8cffa5044b':
  Cancel enrollment when navigating out of enrollment
  String changes for app links in settings
  Remove data item from app info when not supported
  Monkey should not be allowed to switch USB mode
 2015-05-27 21:01:14 +00:00
Andres Morales
27c13e5dc6 Merge "[ConfirmCredential] fix issue where patterns of length 4 are not checked" into mnc-dev 2015-05-27 20:59:28 +00:00
Chad Brubaker
fdda3f5dc7 am 08ffcb99: am 227ba29e: Merge "Clear only keystore credential entires" into mnc-dev 
* commit '08ffcb996e5a54cf127e2ab87ee6689c23e0177e':
  Clear only keystore credential entires
 2015-05-27 20:45:54 +00:00
Andres Morales
6e3a182f9b am 6042133f: am b5746cb1: Merge "[LockSettings] pipe through HW throttle timeout" into mnc-dev 
* commit '6042133f48b340b24babc8c590b874ddac9dfe6f':
  [LockSettings] pipe through HW throttle timeout
 2015-05-27 20:45:52 +00:00
Maurice Lam
2991c52600 am 08b13b02: am 6fd26aae: Merge "[LockScreen] Setup Wizard pattern lock landscape layout" into mnc-dev 
* commit '08b13b0239e70bcb2268cb7ae1aee090300efe81':
  [LockScreen] Setup Wizard pattern lock landscape layout
 2015-05-27 20:45:50 +00:00
Jorim Jaggi
57aeea920e am 30ddbcdb: am fd5ec09f: Merge "Cancel enrollment when navigating out of enrollment" into mnc-dev 
* commit '30ddbcdb680d1ace092fe8e377542a0f6dfc8436':
  Cancel enrollment when navigating out of enrollment
  String changes for app links in settings
  Remove data item from app info when not supported
  Monkey should not be allowed to switch USB mode
 2015-05-27 20:45:49 +00:00
Paul Lawrence
2a6552ed50 Disable back button on crypto screen 
The back button cannot do anything from this activity as it is
only ever launched first thing at boot. So do not permit going back.

Note that screens launched from here (emergency dialer, keyboard config)
still work and their back buttons still work.

Bug: 20730074
Change-Id: I939e05450e5fbd61d12890325c4afe9dcad35c1e
 2015-05-27 20:34:14 +00:00
Paul Lawrence
c04420ce25 Honor password visible setting in CryptKeeper 
Requires matching framework change:
  https://googleplex-android-review.git.corp.google.com/#/c/692822/

Bug: 20184626
Change-Id: I04bfb9ed61a7b40fbc28fbc0b4b10bf848b34a2c
 2015-05-27 20:33:46 +00:00
Chad Brubaker
08ffcb996e am 227ba29e: Merge "Clear only keystore credential entires" into mnc-dev 
* commit '227ba29e3947c8d53cb4a8138f0c3f209ae414e3':
  Clear only keystore credential entires
 2015-05-27 20:23:44 +00:00
Andres Morales
6042133f48 am b5746cb1: Merge "[LockSettings] pipe through HW throttle timeout" into mnc-dev 
* commit 'b5746cb19bef50036eae2353714bc50ff491ba68':
  [LockSettings] pipe through HW throttle timeout
 2015-05-27 20:23:42 +00:00
Maurice Lam
08b13b0239 am 6fd26aae: Merge "[LockScreen] Setup Wizard pattern lock landscape layout" into mnc-dev 
* commit '6fd26aae0d47b6f8ddd472abc8f86cd65c796fda':
  [LockScreen] Setup Wizard pattern lock landscape layout
 2015-05-27 20:23:41 +00:00
Jorim Jaggi
30ddbcdb68 am fd5ec09f: Merge "Cancel enrollment when navigating out of enrollment" into mnc-dev 
* commit 'fd5ec09fe2152c67dc0b529803abc8f5f25f6b7c':
  Cancel enrollment when navigating out of enrollment
  String changes for app links in settings
  Remove data item from app info when not supported
  Monkey should not be allowed to switch USB mode
 2015-05-27 20:23:39 +00:00
Andres Morales
864d13e2c9 [ConfirmCredential] fix issue where patterns of length 4 are not checked 
Change-Id: I2bfcae01be88001a6a9bafa4908305d464522302
 2015-05-27 13:04:38 -07:00
Chad Brubaker
227ba29e39 Merge "Clear only keystore credential entires" into mnc-dev 2015-05-27 20:04:14 +00:00
Andres Morales
b5746cb19b Merge "[LockSettings] pipe through HW throttle timeout" into mnc-dev 2015-05-27 18:37:53 +00:00
Maurice Lam
6fd26aae0d Merge "[LockScreen] Setup Wizard pattern lock landscape layout" into mnc-dev 2015-05-27 18:35:09 +00:00
Jorim Jaggi
fd5ec09fe2 Merge "Cancel enrollment when navigating out of enrollment" into mnc-dev 2015-05-27 18:33:26 +00:00
Geoff Mendal
5c5288378a am 842a597f: (-s ours) am 41b0e87d: (-s ours) am fc05d801: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev 
* commit '842a597fb63bd3194427781b89a6e904854661ee':
  Import translations. DO NOT MERGE
 2015-05-27 16:39:13 +00:00
Xiyuan Xia
4ab225a9e2 am dfba393e: am d82fcc9d: am 4ae8b37c: Merge "Fix transient Next button in confirm screen on orientation change" into mnc-dev 
* commit 'dfba393eada1f46bf53111a5e5deb72d5bc484ff':
  Fix transient Next button in confirm screen on orientation change
 2015-05-27 16:39:12 +00:00
Geoff Mendal
842a597fb6 am 41b0e87d: (-s ours) am fc05d801: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev 
* commit '41b0e87d9af7740053b42f7580bf3a1a9a7a6016':
  Import translations. DO NOT MERGE
 2015-05-27 16:25:08 +00:00
Xiyuan Xia
dfba393ead am d82fcc9d: am 4ae8b37c: Merge "Fix transient Next button in confirm screen on orientation change" into mnc-dev 
* commit 'd82fcc9dfec91d8dda5c12303ed2948dc727cf0e':
  Fix transient Next button in confirm screen on orientation change
 2015-05-27 16:25:07 +00:00
Geoff Mendal
41b0e87d9a am fc05d801: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev 
* commit 'fc05d8010230e410b4acbff6d629ef7b0834b265':
  Import translations. DO NOT MERGE
 2015-05-27 16:07:56 +00:00
Xiyuan Xia
d82fcc9dfe am 4ae8b37c: Merge "Fix transient Next button in confirm screen on orientation change" into mnc-dev 
* commit '4ae8b37c58350209cd097eff2598aefda2441956':
  Fix transient Next button in confirm screen on orientation change
 2015-05-27 16:07:55 +00:00
Geoff Mendal
fc05d80102 Merge "Import translations. DO NOT MERGE" into mnc-dev 2015-05-27 15:57:53 +00:00
Xiyuan Xia
4ae8b37c58 Merge "Fix transient Next button in confirm screen on orientation change" into mnc-dev 2015-05-27 15:54:35 +00:00
Geoff Mendal
61ab32fdc6 Import translations. DO NOT MERGE 
Change-Id: I0a30eee2e063e7246c04a289202d22a9f00dc94e
Auto-generated-cl: translation import
 2015-05-27 08:54:34 -07:00
Geoff Mendal
13026a66a9 Merge "Import translations. DO NOT MERGE" 2015-05-27 15:27:58 +00:00