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

8439 Commits

Author SHA1 Message Date
Andres Morales
fe44bd8f77 am ca7e5073: am 1db27d04: am 6c91ae68: Merge "[MasterClear] fix race in showing dialog" into mnc-dev 
* commit 'ca7e50732f363b10675f2e46380d2ea80c1b767a':
  [MasterClear] fix race in showing dialog
 2015-06-02 16:57:23 +00:00
Andres Morales
ca7e50732f am 1db27d04: am 6c91ae68: Merge "[MasterClear] fix race in showing dialog" into mnc-dev 
* commit '1db27d04293eebf24660d50803b9c2e2c1741672':
  [MasterClear] fix race in showing dialog
 2015-06-02 14:23:34 +00:00
Andres Morales
6c91ae68d9 Merge "[MasterClear] fix race in showing dialog" into mnc-dev 2015-06-02 01:09:31 +00:00
Andres Morales
c17ec1be19 [MasterClear] fix race in showing dialog 
Wiping the PDB effectively starves all other threads from
accessing flash, and freezes the UI. We throw up a dialog
but there's a race between drawing the dialog and starting the
wipe.

Show the dialog in onPreExecute to fix this.

Bug: 20854355
Change-Id: I8462f5ed3ff53ed574ebc1be416a821c2086b4f5
 2015-06-01 16:23:41 -07:00
Jason Monk
36457e06d0 am 8b8092aa: am 3974d3d4: am ef1d4b66: Merge "Make Theme a DropDownPreference" into mnc-dev 
* commit '8b8092aa0995e403cba09b19f955aa2bef00974a':
  Make Theme a DropDownPreference
 2015-06-01 20:33:09 +00:00
Jason Monk
8b8092aa09 am 3974d3d4: am ef1d4b66: Merge "Make Theme a DropDownPreference" into mnc-dev 
* commit '3974d3d4e6f523bd743aa0078b68d366f64b4661':
  Make Theme a DropDownPreference
 2015-06-01 20:20:50 +00:00
Jason Monk
ef1d4b66ab Merge "Make Theme a DropDownPreference" into mnc-dev 2015-06-01 19:54:53 +00:00
Jason Monk
3d95908e02 Make Theme a DropDownPreference 
Also make DropDownPreference support xml lists defined the same
way as ListPreferences.

Bug: 21300431
Change-Id: I1698e8ddcd6134034c3367a6afe36f9740e9efec
 2015-06-01 15:49:17 -04:00
Sanket Padawe
4699d796a5 am f90c8a46: am ef2b8dc4: am 0be403db: Merge "Send sim change notification based on sim state change." into mnc-dev 
* commit 'f90c8a46b86056374cc7eec22a65116dc40aae7f':
  Send sim change notification based on sim state change.
 2015-06-01 19:06:00 +00:00
Sanket Padawe
f90c8a46b8 am ef2b8dc4: am 0be403db: Merge "Send sim change notification based on sim state change." into mnc-dev 
* commit 'ef2b8dc47ec28ade46c180813452898ee4b42ec4':
  Send sim change notification based on sim state change.
 2015-06-01 18:51:55 +00:00
Stuart Scott
b4c2ab8622 am 1925989e: am 47ed6ca0: Network Reset should have a lockdown like Factory Reset. 
* commit '1925989ed9b91a1426a14346a6f687173e98b868':
  Network Reset should have a lockdown like Factory Reset.
 2015-06-01 18:50:47 +00:00
Sanket Padawe
0be403dbed Merge "Send sim change notification based on sim state change." into mnc-dev 2015-06-01 17:55:12 +00:00
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
Sanket Padawe
9d7eb49e7b Send sim change notification based on sim state change. 
+ Send sim change notifications based on Sim state change rather then based
on subscription change.
+ Make SimSettings dynamically update based on subscriptions changed. Would
support hotswap which was not supported before this.

Bug: 20739298
Bug: 18385348
Change-Id: I5bb4b05f55b94eb0ed2a1a83fe2f168192b2b684
 2015-06-01 10:25:46 -07: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
Stuart Scott
47ed6ca004 Network Reset should have a lockdown like Factory Reset. 
bug:20332322
Change-Id: I645ad0d226869042c11225630e4de5968ebb7a0d
(cherry picked from commit 176f512c5a)
 2015-06-01 16:30:48 +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