Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
20,663 Commits 1 Branch 0 Tags
00340c334d4c667e2e1c148c360f65f3c6d5a4cb
Commit Graph

8388 Commits

Author SHA1 Message Date
Jason Monk
3430cfbe05 am 266fc6df: am ef4ec260: am 15dcebe1: Help fallbacks and intent work 
* commit '266fc6df9420beeedae0c1647e1e05f60e87c7c7':
  Help fallbacks and intent work
 2015-05-28 14:49:22 +00:00
Jason Monk
266fc6df94 am ef4ec260: am 15dcebe1: Help fallbacks and intent work 
* commit 'ef4ec2603270dac4b7a001220b023721ce3aab54':
  Help fallbacks and intent work
 2015-05-28 14:34:07 +00: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
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
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
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
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
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
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
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
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
Jorim Jaggi
fd5ec09fe2 Merge "Cancel enrollment when navigating out of enrollment" into mnc-dev 2015-05-27 18:33:26 +00:00
Jason Monk
bae05490bb am 4562d9f5: am 4b34804b: am 51334310: Add no data usage string 
* commit '4562d9f57a904560c8f43500ccdf99b42d533e7f':
  Add no data usage string
 2015-05-27 14:30:18 +00:00
Jason Monk
4562d9f57a am 4b34804b: am 51334310: Add no data usage string 
* commit '4b34804b5124f8b71b14d4fbacedb948e5ec6820':
  Add no data usage string
 2015-05-27 14:17:54 +00:00
Jason Monk
51334310a2 Add no data usage string 
Add a no data usage string so we can avoid showing incorrect dates
when no data is available.

Bug: 21076561
Change-Id: I4568cd750fe5f973fed0ff4ffa48412d8c6afd97
 2015-05-27 09:02:16 -04:00
Jorim Jaggi
bc68ba22f1 Cancel enrollment when navigating out of enrollment 
Change-Id: Ifee1572189765cbfa4c23e6176831c8f729bbd2b
 2015-05-26 17:52:01 -07:00
Xiyuan Xia
9e1cdbe139 am 3c123ad7: am 3d36f54a: am a4e0492c: Merge "No auto soft keyboard when fp is in use" into mnc-dev 
* commit '3c123ad726892edce6df173787ff89e103332b70':
  No auto soft keyboard when fp is in use
 2015-05-26 21:37:38 +00:00
Xiyuan Xia
3c123ad726 am 3d36f54a: am a4e0492c: Merge "No auto soft keyboard when fp is in use" into mnc-dev 
* commit '3d36f54abcec1bb110e6c5e8e78fa2af5edf79e6':
  No auto soft keyboard when fp is in use
 2015-05-26 21:27:18 +00:00
Xiyuan Xia
a4e0492c11 Merge "No auto soft keyboard when fp is in use" into mnc-dev 2015-05-26 21:05:27 +00:00
Jason Monk
87dfa5d1dd am 50ea0493: am ec39177c: am 44fb627c: Merge "Don\'t have app info pages load so much info" into mnc-dev 
* commit '50ea0493c38e682ad79cc92c4cb8404fe993932c':
  Don't have app info pages load so much info
 2015-05-26 20:50:17 +00:00
Jason Monk
50ea0493c3 am ec39177c: am 44fb627c: Merge "Don\'t have app info pages load so much info" into mnc-dev 
* commit 'ec39177c2bca1fb1e8b0b1fffccf05749d27d226':
  Don't have app info pages load so much info
 2015-05-26 20:42:36 +00:00
John Spurlock
c72930e51a am ad17aea7: am d070d52a: am 90f5f4cb: Merge "Settings: Display corp profile calendars in event rule selection." into mnc-dev 
* commit 'ad17aea79d1b88bcada71cfda3ac616ad1755543':
  Settings: Display corp profile calendars in event rule selection.
 2015-05-26 20:23:13 +00:00
Jason Monk
44fb627cf6 Merge "Don't have app info pages load so much info" into mnc-dev 2015-05-26 20:20:38 +00:00
Jason Monk
646befdd16 Don't have app info pages load so much info 
They don't need to resume the ApplicationsState session because they
only need info for one app, instead just make sure ApplicationsState
can load the info as requested.

Bug: 20696893
Change-Id: I146387438348fad1396ac4528819b2f1a93a97bf
 2015-05-26 16:20:09 -04:00
John Spurlock
ad17aea79d am d070d52a: am 90f5f4cb: Merge "Settings: Display corp profile calendars in event rule selection." into mnc-dev 
* commit 'd070d52a7b8d9cf96fe96027cb089ab5d999c7c9':
  Settings: Display corp profile calendars in event rule selection.
 2015-05-26 20:08:28 +00:00
Jason Monk
ff24d5d941 am 969b5842: am 49ad08e2: am 1ecfc645: Merge "Fix crash while rotating with app info dialog up" into mnc-dev 
* commit '969b58420fbe5620a367e134f9cc1b15aa773365':
  Fix crash while rotating with app info dialog up
 2015-05-26 19:55:20 +00:00
Jason Monk
969b58420f am 49ad08e2: am 1ecfc645: Merge "Fix crash while rotating with app info dialog up" into mnc-dev 
* commit '49ad08e20fda90f03bb89ba395a6d14d00406a25':
  Fix crash while rotating with app info dialog up
 2015-05-26 19:42:10 +00:00
John Spurlock
90f5f4cbd1 Merge "Settings: Display corp profile calendars in event rule selection." into mnc-dev 2015-05-26 19:41:55 +00:00
Jason Monk
1ecfc645ee Merge "Fix crash while rotating with app info dialog up" into mnc-dev 2015-05-26 19:22:18 +00:00
Sanket Padawe
6c30d05691 am 9c62ddec: am 86dbdff1: am 6d9500d0: Merge "Fix generation of pin for WPS on screen rotation." into mnc-dev 
* commit '9c62ddeca6de29eb6cfd2129cbe69c41046c5bdb':
  Fix generation of pin for WPS on screen rotation.
 2015-05-26 19:17:16 +00:00
Jason Monk
5e2529aeb4 Fix crash while rotating with app info dialog up 
Bug: 21037445
Change-Id: Ie5b0f8aa04913d0ab781be334c6c305db97235a0
 2015-05-26 15:12:18 -04:00
Sanket Padawe
9c62ddeca6 am 86dbdff1: am 6d9500d0: Merge "Fix generation of pin for WPS on screen rotation." into mnc-dev 
* commit '86dbdff1fa203b415929fb6c65fa431d56e7eaa8':
  Fix generation of pin for WPS on screen rotation.
 2015-05-26 19:09:29 +00:00
Sanket Padawe
6d9500d04c Merge "Fix generation of pin for WPS on screen rotation." into mnc-dev 2015-05-26 18:46:04 +00:00
Jason Monk
e224c39795 am 1737c2e5: am 5b1c0329: am 7231147b: Merge "Unbanish memory screen and new UX" into mnc-dev 
* commit '1737c2e5ef093a4db2ec1ede8ad523e62ce1f61f':
  Unbanish memory screen and new UX
 2015-05-26 17:28:16 +00:00
Jason Monk
1737c2e5ef am 5b1c0329: am 7231147b: Merge "Unbanish memory screen and new UX" into mnc-dev 
* commit '5b1c03293c5e0914f773644b2958d321dc83afbe':
  Unbanish memory screen and new UX
 2015-05-26 17:13:47 +00:00
Jason Monk
05ce384b62 am 28d03835: am 3f058ca1: am e9866b6d: Add permission summaries back in 
* commit '28d03835abd1cccaa958c9832063103b3e8d8d3c':
  Add permission summaries back in
 2015-05-26 17:06:02 +00:00
John Spurlock
fa76a652e4 Settings: Display corp profile calendars in event rule selection. 
And sort the accounts by display name.

Bug: 21155107
Change-Id: I8789022535ba7c66d950f5ec6f93c40ffb8106d3
 2015-05-26 12:55:56 -04:00
Jason Monk
7231147b56 Merge "Unbanish memory screen and new UX" into mnc-dev 2015-05-26 16:55:42 +00:00
Jason Monk
28d03835ab am 3f058ca1: am e9866b6d: Add permission summaries back in 
* commit '3f058ca1c8f1a03b8c476c2e87163682f8c266d6':
  Add permission summaries back in
 2015-05-26 16:53:30 +00:00