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

20524 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Maurice Lam
2b32334400 am bc04d414: am 83d636a3: Merge "[WifiSettings] Remove unused Wi-Fi icon" into mnc-dev 
* commit 'bc04d414e31999f05e15f1f3b8e749f8c85a68fc':
  [WifiSettings] Remove unused Wi-Fi icon
 2015-06-01 18:51:01 +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
Geoff Mendal
7aa2f36495 am 8e1a4818: (-s ours) am b16d2a02: (-s ours) Import translations. DO NOT MERGE 
* commit '8e1a48180622bb458c191436fcea5db1eb9074d6':
  Import translations. DO NOT MERGE
 2015-06-01 18:50:18 +00:00
Sanket Padawe
ef2b8dc47e am 0be403db: Merge "Send sim change notification based on sim state change." into mnc-dev 
* commit '0be403dbeddefc2cbb98235518aac7fdc47ad93a':
  Send sim change notification based on sim state change.
 2015-06-01 18:05:17 +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
Maurice Lam
bc04d414e3 am 83d636a3: Merge "[WifiSettings] Remove unused Wi-Fi icon" into mnc-dev 
* commit '83d636a3fbe89131d111085cc68b54e323f09259':
  [WifiSettings] Remove unused Wi-Fi icon
 2015-06-01 17:32:34 +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
Maurice Lam
83d636a3fb Merge "[WifiSettings] Remove unused Wi-Fi icon" into mnc-dev 2015-06-01 17:17:19 +00:00
Geoff Mendal
1e55402342 am 360f69df: (-s ours) am b777c6e2: (-s ours) Import translations. DO NOT MERGE 
* commit '360f69dfa5961524556e35ef6b5c8ca85b40ac28':
  Import translations. DO NOT MERGE
 2015-06-01 17:09:41 +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
Stuart Scott
1925989ed9 am 47ed6ca0: Network Reset should have a lockdown like Factory Reset. 
* commit '47ed6ca004dcfe9498269602b109b1e667fae287':
  Network Reset should have a lockdown like Factory Reset.
 2015-06-01 16:44:06 +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
Geoff Mendal
8e1a481806 am b16d2a02: (-s ours) Import translations. DO NOT MERGE 
* commit 'b16d2a0242e1709e7abe3683f96703ec576719da':
  Import translations. DO NOT MERGE
 2015-06-01 16:28:59 +00:00
Geoff Mendal
b16d2a0242 Import translations. DO NOT MERGE 
Change-Id: Idf3b09809f2f964abef75349083eb11a2bfc7a8c
Auto-generated-cl: translation import
 2015-06-01 09:09:54 -07: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
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
Geoff Mendal
e4074ad4b4 am 9a39e082: (-s ours) am d6242009: (-s ours) Import translations. DO NOT MERGE 
* commit '9a39e08201ad1cce5d7c844273dbb1ed720a0ab0':
  Import translations. DO NOT MERGE
 2015-06-01 14:46:24 +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
Geoff Mendal
360f69dfa5 am b777c6e2: (-s ours) Import translations. DO NOT MERGE 
* commit 'b777c6e20541a01f4219e1020445d091fbfe3217':
  Import translations. DO NOT MERGE
 2015-05-30 22:42:32 +00:00
Geoff Mendal
b777c6e205 Import translations. DO NOT MERGE 
Change-Id: I2a83b506d2d5c74818178dbc76b07b2f97ff2c87
Auto-generated-cl: translation import
 2015-05-30 17:28:38 -05:00
Maurice Lam
abaca6627b [WifiSettings] Remove unused Wi-Fi icon 
wifi_signal_light was replaced by wifi_signal (which can take any
color via theme attributes). Remove the unused assets.

Change-Id: If1823f9fa74ddaeb54f4a79a5d42db3b24f723d9
 2015-05-29 20:38:44 -07:00
Xiyuan Xia
89a0ba67ff am dc6bd8d2: Merge "Ignore fp error message when not listening" into mnc-dev 
* commit 'dc6bd8d2f1b2b5f28d59d00ef178e64229ab59ef':
  Ignore fp error message when not listening
 2015-05-30 03:38:09 +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
59e340d735 am 097936ad: Hide guest entry if the user is not allowed to create guest 
* commit '097936ad1b6632787127cbefe38373e9696e377d':
  Hide guest entry if the user is not allowed to create guest
 2015-05-29 21:42:41 +00: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
8a1683f245 am 01f35ce4: Merge "Use DimmableIconPreference for Add user action" into mnc-dev 
* commit '01f35ce46e584e0fd699c3330eba564eb6811dc5':
  Use DimmableIconPreference for Add user action
 2015-05-29 20:58:17 +00:00
Fyodor Kupolov
8e998b71f0 am 2defc457: Merge "Hide the collapse/expand icon if text fits the screen" into mnc-dev 
* commit '2defc457bdd0a13f6ece49a20d5120616ca3eaaf':
  Hide the collapse/expand icon if text fits the screen
 2015-05-29 20:52:07 +00: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
Tony Mantler
55cd8fe315 am 3e7f2b44: Merge "Move ZoneGetter into SettingsLib" into mnc-dev 
* commit '3e7f2b445875ffbbbab2e3586985a247ebaec03a':
  Move ZoneGetter into SettingsLib
 2015-05-29 19:20:49 +00:00
Geoff Mendal
9a39e08201 am d6242009: (-s ours) Import translations. DO NOT MERGE 
* commit 'd6242009d6f0754083eee1a8d9da7e89bc2d3aec':
  Import translations. DO NOT MERGE
 2015-05-29 19:19:32 +00:00
John Spurlock
08788dccaf am 00e39238: Merge "Settings: Migrate zen event conditions to use calendar name." into mnc-dev 
* commit '00e392387b8989a52e6fc66f14582ae709594852':
  Settings: Migrate zen event conditions to use calendar name.
 2015-05-29 19:18:40 +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
Tony Mantler
3e7f2b4458 Merge "Move ZoneGetter into SettingsLib" into mnc-dev 2015-05-29 16:44:48 +00:00
Geoff Mendal
d6242009d6 Import translations. DO NOT MERGE 
Change-Id: I317a9af71a1ab755f032066f7239c6e1e2f6e5ec
Auto-generated-cl: translation import
 2015-05-29 09:22:09 -05: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
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
Paul Lawrence
a25cf52c7a am 750648c5: Merge "Disable back button on crypto screen" into mnc-dev 
* commit '750648c5ae2b975d7aea45601d17f4c0796e8db4':
  Disable back button on crypto screen
 2015-05-28 19:53:08 +00:00
Paul Lawrence
750648c5ae Merge "Disable back button on crypto screen" into mnc-dev 2015-05-28 19:37:28 +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
a5c3cf4003 am 7c3b9f28: Merge "Make use of WifiTracker\'s WorkerThread support" into mnc-dev 
* commit '7c3b9f28b5b547fcdfb78d9e24f4d9b694c91c28':
  Make use of WifiTracker's WorkerThread support
 2015-05-28 16:48:46 +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
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