Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
20,716 Commits 1 Branch 0 Tags
4dea82033c945f8710e0025b13a2ed4908e048bc
Commit Graph

8425 Commits

Author SHA1 Message Date
Xiyuan Xia
4dea82033c am cb7312ac: am 89a0ba67: am dc6bd8d2: Merge "Ignore fp error message when not listening" into mnc-dev 
* commit 'cb7312acd420c59ea7b08e6c14c6537c7d34f613':
  Ignore fp error message when not listening
 2015-06-01 17:27:00 +00:00
Xiyuan Xia
cb7312acd4 am 89a0ba67: am dc6bd8d2: Merge "Ignore fp error message when not listening" into mnc-dev 
* commit '89a0ba67ff06be4d4fc842b25197b19ff01b85f9':
  Ignore fp error message when not listening
 2015-06-01 17:08:24 +00:00
Fyodor Kupolov
5f35cb367d am 222ebbaf: am 59e340d7: am 097936ad: Hide guest entry if the user is not allowed to create guest 
* commit '222ebbafc16eddc101cdcec2a73f946ab0942556':
  Hide guest entry if the user is not allowed to create guest
 2015-06-01 15:48:22 +00:00
Fyodor Kupolov
963da2b1e4 am aeaf219e: am 8a1683f2: am 01f35ce4: Merge "Use DimmableIconPreference for Add user action" into mnc-dev 
* commit 'aeaf219eaebb6c0c541a0f701553ee0225d89794':
  Use DimmableIconPreference for Add user action
 2015-06-01 15:48:20 +00:00
Fyodor Kupolov
6cf28dcc45 am 4f621f51: am 8e998b71: am 2defc457: Merge "Hide the collapse/expand icon if text fits the screen" into mnc-dev 
* commit '4f621f5126f31bb4e4d3f73280c1e09be8c9013e':
  Hide the collapse/expand icon if text fits the screen
 2015-06-01 15:48:18 +00:00
Fyodor Kupolov
222ebbafc1 am 59e340d7: am 097936ad: Hide guest entry if the user is not allowed to create guest 
* commit '59e340d735b3b74b9eb6726f45f740c17302b740':
  Hide guest entry if the user is not allowed to create guest
 2015-06-01 15:28:14 +00:00
Fyodor Kupolov
aeaf219eae am 8a1683f2: am 01f35ce4: Merge "Use DimmableIconPreference for Add user action" into mnc-dev 
* commit '8a1683f24555803c853c6f86d8dff1355eeaf666':
  Use DimmableIconPreference for Add user action
 2015-06-01 15:27:23 +00:00
Fyodor Kupolov
4f621f5126 am 8e998b71: am 2defc457: Merge "Hide the collapse/expand icon if text fits the screen" into mnc-dev 
* commit '8e998b71f0cdba1c85cadaebb4dfc8e80bd0ac52':
  Hide the collapse/expand icon if text fits the screen
 2015-06-01 15:27:21 +00:00
Tony Mantler
e0a585bbd2 am 9e05e536: am 55cd8fe3: am 3e7f2b44: Merge "Move ZoneGetter into SettingsLib" into mnc-dev 
* commit '9e05e536915db3e8e4eee62a99ff2281f871bb85':
  Move ZoneGetter into SettingsLib
 2015-06-01 15:26:05 +00:00
John Spurlock
64f994592e am 48018ddc: am 08788dcc: am 00e39238: Merge "Settings: Migrate zen event conditions to use calendar name." into mnc-dev 
* commit '48018ddc7220bbe6aae3f685215faca08cc51ca0':
  Settings: Migrate zen event conditions to use calendar name.
 2015-06-01 15:26:03 +00:00
Tony Mantler
9e05e53691 am 55cd8fe3: am 3e7f2b44: Merge "Move ZoneGetter into SettingsLib" into mnc-dev 
* commit '55cd8fe3150fb4e7470dbbce58cbbab45373d3e5':
  Move ZoneGetter into SettingsLib
 2015-06-01 14:46:25 +00:00
John Spurlock
48018ddc72 am 08788dcc: am 00e39238: Merge "Settings: Migrate zen event conditions to use calendar name." into mnc-dev 
* commit '08788dccaf733d855b7a2391095076a642b697f9':
  Settings: Migrate zen event conditions to use calendar name.
 2015-06-01 14:46:23 +00:00
Xiyuan Xia
dc6bd8d2f1 Merge "Ignore fp error message when not listening" into mnc-dev 2015-05-30 03:28:52 +00:00
Xiyuan Xia
f1bc6e52b5 Ignore fp error message when not listening 
Bug:21413567
Change-Id: I66cde924f77d1df13a3cabd2b118439d59ef1d88
 2015-05-29 16:19:29 -07:00
Fyodor Kupolov
097936ad1b Hide guest entry if the user is not allowed to create guest 
Don't show the Guest entry for a secondary user if the user is not allowed to
create a guest and there is currently no guest already created.

Bug: 19035769
Change-Id: Icf4a778533affaec0658af4da5ce000eda261f38
 2015-05-29 14:07:12 -07:00
Fyodor Kupolov
01f35ce46e Merge "Use DimmableIconPreference for Add user action" into mnc-dev 2015-05-29 20:42:55 +00:00
Fyodor Kupolov
2defc457bd Merge "Hide the collapse/expand icon if text fits the screen" into mnc-dev 2015-05-29 20:27:15 +00:00
Fyodor Kupolov
1c8600b0c8 Hide the collapse/expand icon if text fits the screen 
Icon should be hidden if explanation text fits the screen, otherwise user
should be able to click the image to collapse/expand the text.

Bug: 20554398
Change-Id: I7fb06be6e6c195a5c1bcac504f4af2d67ef4211e
 2015-05-29 11:21:42 -07:00
Maxim Bogatov
838a2f845a Merge "Make whole switchable header act as single Switch for AccessibilityService" 2015-05-29 17:49:36 +00:00
Tony Mantler
3e7f2b4458 Merge "Move ZoneGetter into SettingsLib" into mnc-dev 2015-05-29 16:44:48 +00:00
John Spurlock
00e392387b Merge "Settings: Migrate zen event conditions to use calendar name." into mnc-dev 2015-05-29 13:22:36 +00:00
John Spurlock
bd352af3cf Settings: Migrate zen event conditions to use calendar name. 
And make sure any existing calendar value always appears in the
picker, even before it exists in the calendar provider.

Bug: 17755700
Change-Id: I8aa298a0d5804c288e2596f18c2dc7318f752121
 2015-05-28 22:20:44 -04:00
Paul Lawrence
5ea9cc81ef am c93ccee5: am a25cf52c: am 750648c5: Merge "Disable back button on crypto screen" into mnc-dev 
* commit 'c93ccee5e011e58341abe97d6c9d329cb11526ef':
  Disable back button on crypto screen
 2015-05-28 22:54:07 +00:00
Paul Lawrence
c93ccee5e0 am a25cf52c: am 750648c5: Merge "Disable back button on crypto screen" into mnc-dev 
* commit 'a25cf52c7ab590ab0c58d38a742f10d3d37fd63c':
  Disable back button on crypto screen
 2015-05-28 22:34:25 +00:00
Tony Mantler
550015e476 Move ZoneGetter into SettingsLib 
Change-Id: Ia998ae0bd7fc4c974e03df7c8fc380d98a3e71de
 2015-05-28 14:49:19 -07:00
Maxim Bogatov
c99d0a8a79 Make whole switchable header act as single Switch for 
AccessibilityService

second part of b/21305287

Change-Id: I80da2ecbc367e10d027a851193f4d03ab8e09c69
 2015-05-28 13:20:54 -07:00
Paul Lawrence
750648c5ae Merge "Disable back button on crypto screen" into mnc-dev 2015-05-28 19:37:28 +00:00
Jason Monk
3740563649 am f8adf493: am a5c3cf40: am 7c3b9f28: Merge "Make use of WifiTracker\'s WorkerThread support" into mnc-dev 
* commit 'f8adf493477f3e18ab55ae2fb9f34f2fd010abc6':
  Make use of WifiTracker's WorkerThread support
 2015-05-28 17:46:16 +00:00
Jason Monk
f8adf49347 am a5c3cf40: am 7c3b9f28: Merge "Make use of WifiTracker\'s WorkerThread support" into mnc-dev 
* commit 'a5c3cf4003ec5314a6fe05fa355e599c80e82469':
  Make use of WifiTracker's WorkerThread support
 2015-05-28 17:30:52 +00:00
Jason Monk
7c3b9f28b5 Merge "Make use of WifiTracker's WorkerThread support" into mnc-dev 2015-05-28 16:37:39 +00:00
Jason Monk
7a0b412ed2 Make use of WifiTracker's WorkerThread support 
Let the AccessPoint callbacks come in on a BG thread and do more
of the handling there.

Bug: 21486080
Change-Id: I529152d9f5c429b790a669b75b6d955ce4336caf
 2015-05-28 12:26:09 -04:00
Jason Monk
6e76f98f06 am eb859db1: am 5ab0c9c9: am a7fe759d: Merge "More memory updates" into mnc-dev 
* commit 'eb859db14fbb0b7050d518edade44409ef213743':
  More memory updates
 2015-05-28 15:05:02 +00:00
Jason Monk
eb859db14f am 5ab0c9c9: am a7fe759d: Merge "More memory updates" into mnc-dev 
* commit '5ab0c9c9e37d8ca17b2e40ccaf6913149cdd78c2':
  More memory updates
 2015-05-28 14:49:28 +00:00
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
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
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