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

20548 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Andre Eisenbach
a69b8d12a5 am 1cf03ebb: am 7292d892: Merge "Bluetooth PAN: Set isPreferred to true (2/2)" into mnc-dev 
* commit '1cf03ebb72d57be8b0aac8f648898d78c8047436':
  Bluetooth PAN: Set isPreferred to true (2/2)
 2015-06-02 14:24:51 +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
Sanket Padawe
7ae9d9bb13 am 64ec3868: am afa6361d: Merge "Fix scrolling issue for Wifi hotspot setup layout." into mnc-dev 
* commit '64ec3868378f8487218b0a618c138a038d548de0':
  Fix scrolling issue for Wifi hotspot setup layout.
 2015-06-02 14:21:20 +00:00
Andre Eisenbach
1cf03ebb72 am 7292d892: Merge "Bluetooth PAN: Set isPreferred to true (2/2)" into mnc-dev 
* commit '7292d89280f7c4814e8fa93903dc73e3515b6558':
  Bluetooth PAN: Set isPreferred to true (2/2)
 2015-06-02 09:44:38 +00:00
Andre Eisenbach
7292d89280 Merge "Bluetooth PAN: Set isPreferred to true (2/2)" into mnc-dev 2015-06-02 09:00:31 +00:00
Andre Eisenbach
901ce5de8d Bluetooth PAN: Set isPreferred to true (2/2) 
isPreferred must always be true for PAN so that the DUT can initiate
a PANU connection with the remote device not only from the internet
access menu in the profile setting, but also from the paired device
list menu.

Currently isPreferred is only true when PAN is in connected state
for the PANU role, so it will return false when the PAN profile is
not connected and the PANU connection will never be initiated
from the paired device list menu.

Change-Id: I3d52d89136269508ac6416b695b22842f4bb557a
 2015-06-02 01:59:37 -07:00
Andres Morales
1db27d0429 am 6c91ae68: Merge "[MasterClear] fix race in showing dialog" into mnc-dev 
* commit '6c91ae68d98431142a5ea3a92601535e5d6c91f0':
  [MasterClear] fix race in showing dialog
 2015-06-02 01:20:32 +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
Sanket Padawe
64ec386837 am afa6361d: Merge "Fix scrolling issue for Wifi hotspot setup layout." into mnc-dev 
* commit 'afa6361d36f522b4361c4a91a33edd39d322363a':
  Fix scrolling issue for Wifi hotspot setup layout.
 2015-06-01 22:34:20 +00:00
Sanket Padawe
afa6361d36 Merge "Fix scrolling issue for Wifi hotspot setup layout." into mnc-dev 2015-06-01 22:21:52 +00:00
Sanket Padawe
346625ad8f Fix scrolling issue for Wifi hotspot setup layout. 
Bug: 19856113
Change-Id: Id49ac7c452f10e0de43b18ecdecc68619faecbc3
 2015-06-01 15:18:48 -07: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
3974d3d4e6 am ef1d4b66: Merge "Make Theme a DropDownPreference" into mnc-dev 
* commit 'ef1d4b66abd4e3c1ff4759a4dba7f7f5947af2d3':
  Make Theme a DropDownPreference
 2015-06-01 20:06:52 +00:00
Jason Monk
75059f1ac4 am b77a8177: am 0d2eea38: Merge "Change name of search menu item to be more descriptive" into mnc-dev 
* commit 'b77a81773480b374b2ccf9ee3ae9dd430663c2d4':
  Change name of search menu item to be more descriptive
 2015-06-01 20:06:25 +00:00
Jason Monk
b77a817734 am 0d2eea38: Merge "Change name of search menu item to be more descriptive" into mnc-dev 
* commit '0d2eea38bf79a76a3179259442116a995dcb2e6f':
  Change name of search menu item to be more descriptive
 2015-06-01 19:55:14 +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
Jason Monk
0d2eea38bf Merge "Change name of search menu item to be more descriptive" into mnc-dev 2015-06-01 19:45:27 +00:00
Jason Monk
e5d14dc606 Change name of search menu item to be more descriptive 
(for accessibility)

Bug: 20345352
Change-Id: Id8c74f4bf3753dc36153965923859315ecc07a9a
 2015-06-01 15:21:07 -04:00
Maurice Lam
96141ef9e9 am e854138a: am 6cd24c68: Merge "[WifiSetup] Add + icon to Add another network" into mnc-dev 
* commit 'e854138ad1960e5e884c51626d27dc72fcfc3dfa':
  [WifiSetup] Add + icon to Add another network
 2015-06-01 19:02:12 +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
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
Maurice Lam
e854138ad1 am 6cd24c68: Merge "[WifiSetup] Add + icon to Add another network" into mnc-dev 
* commit '6cd24c687d9bdc2a69796e795fa86d6d95c9b60d':
  [WifiSetup] Add + icon to Add another network
 2015-06-01 18:49:41 +00:00
Maurice Lam
6cd24c687d Merge "[WifiSetup] Add + icon to Add another network" into mnc-dev 2015-06-01 18:40:47 +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
Maurice Lam
8dc986216c [WifiSetup] Add + icon to Add another network 
Add the + icon to "Add another network" in Wi-Fi screen in setup
wizard, and make the text black and sentence case.

Bug: 21089864
Change-Id: Iccfc5fc4ff5e50a599f3004a20e5cfa24a13043a
 2015-05-29 20:34:03 -07:00
Xiyuan Xia
dc6bd8d2f1 Merge "Ignore fp error message when not listening" into mnc-dev 2015-05-30 03:28:52 +00:00