PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
16,423 Commits 1 Branch 0 Tags
32f0525c78a0777f4811d564b8990214fb157c0c
Commit Graph

16423 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alexandra Gherghina
f43aa811b7 Fix NPE in Running Processes view in Apps Settings 
Bug: 18676587
Change-Id: Ib4b400241f0ebd6dd4aacad4bfdda6dfb75cdfb5
 2014-12-10 10:24:31 +00:00
Maurice Lam
0fde6bb98a Merge "[FRP] Shrink lock screen when keyboard pops up" into lmp-mr1-dev 
automerge: e0f637a

* commit 'e0f637a66b9dbaaec80ef36c52a96fbb65735790':
  [FRP] Shrink lock screen when keyboard pops up
 2014-12-10 01:22:29 +00:00
Maurice Lam
e0f637a66b Merge "[FRP] Shrink lock screen when keyboard pops up" into lmp-mr1-dev 2014-12-10 01:17:15 +00:00
Emily Bernier
50ac12e222 Listen for CONNECTIVITY_ACTION broadcasts in WifiSetupActivity 
In some cases, NETWORK_STATE_CHANGED_ACTION broadcasts are sent before
the current network state has been updated in ConnectivityService. Listening
for CONNECTIVITY_ACTION broadcasts as well ensures that we properly catch
new connections and auto-advance appropriately.

Bug: 18503725
Change-Id: Ia414d57d196d09171342fb3ae93c7e826cb1a1aa
 2014-12-09 20:02:41 -05:00
PauloftheWest
58a73bbc0a am aa800609: Merge "Added Multi-SIM capability to Access Point Names" into lmp-mr1-dev 
* commit 'aa800609304b4787091b1805b2439423b3192bb1':
  Added Multi-SIM capability to Access Point Names
 2014-12-09 23:17:50 +00:00
PauloftheWest
bfb8449aea am e6d7b31f: Merge "Fixed a SIM Lock UI issue" into lmp-mr1-dev 
* commit 'e6d7b31fc44ef6f0865ef22401217b70a6676eaa':
  Fixed a SIM Lock UI issue
 2014-12-09 23:12:52 +00:00
PauloftheWest
aa80060930 Merge "Added Multi-SIM capability to Access Point Names" into lmp-mr1-dev 2014-12-09 23:10:36 +00:00
PauloftheWest
e6d7b31fc4 Merge "Fixed a SIM Lock UI issue" into lmp-mr1-dev 2014-12-09 23:04:19 +00:00
Zoltan Szatmary-Ban
d80e1278b0 Bring up correct app for Recent location list items 
When clicking on a list item in Settings > Location > Recent locations,
the correct app should be shown for items corresponding to managed
profile apps.

Bug: 17655978
Change-Id: Ie4b388f0ea103ee16629b0d8d92e5de08adffc5e
 2014-12-09 19:20:21 +00:00
Wink Saville
f8c4fe2d3c am 85d3b0fa: Merge "Add debug dataEnable." into lmp-mr1-dev 
* commit '85d3b0fa6e2e8988f48a5a830dc3d279d05619fd':
  Add debug dataEnable.
 2014-12-09 17:58:30 +00:00
Wink Saville
85d3b0fa6e Merge "Add debug dataEnable." into lmp-mr1-dev 2014-12-09 17:52:20 +00:00
Maurice Lam
a49c7c572f [FRP] Shrink lock screen when keyboard pops up 
Because setup wizard uses immersive mode, the default adjustResize
flag doesn't work; so we need to respond to window insets manually.

Bug: 18651680
Change-Id: I9e53d3455c41404cca8a347b49b559200353b7ac
 2014-12-08 18:43:11 -08:00
Prem Kumar
35b3257e07 am 1e1251cc: Merge "Fixed a SIM Cards crash." into lmp-mr1-dev 
* commit '1e1251cc04ee9636721719aa0a13d94e15500258':
  Fixed a SIM Cards crash.
 2014-12-09 02:30:23 +00:00
Prem Kumar
1e1251cc04 Merge "Fixed a SIM Cards crash." into lmp-mr1-dev 2014-12-09 02:25:15 +00:00
John Spurlock
8aa3e66389 am 1e3be7d9: Merge "Settings: Rebind to volume sliders after returning from stopped." into lmp-mr1-dev 
* commit '1e3be7d9ce27cf5ee7df78c675603a628eb0023d':
  Settings: Rebind to volume sliders after returning from stopped.
 2014-12-09 00:08:42 +00:00
PauloftheWest
0b8788aae4 Fixed a SIM Lock UI issue 
+ The SIM lock option will now appear if there is any SIM with locking
capabilities.
+ Also, if the first slot does not have a SIM in it, then the SIM lock
screen will disable the ability to lock the first slot.

Bug: 18473536
Change-Id: Ib4e0ed6e94b00bc07c9febdad433fdb3c55294b8
 2014-12-08 13:51:25 -08:00
John Spurlock
1e3be7d9ce Merge "Settings: Rebind to volume sliders after returning from stopped." into lmp-mr1-dev 2014-12-08 20:27:02 +00:00
PauloftheWest
c29c583536 Fixed a SIM Cards crash. 
+ Added a check if getActiveSubscriptionInfoList returns null.

Bug: 18634751
Change-Id: Ib6012816c26525a61fb199912d06d6c1572e0fd6
 2014-12-08 12:24:28 -08:00
John Spurlock
aaaa54ec0e Settings: Rebind to volume sliders after returning from stopped. 
Bug: 18118623
Change-Id: I29fb22a1a4476639a4f5cce06affd8ce58b6105d
 2014-12-08 15:20:33 -05:00
PauloftheWest
6f341b2c3e Added Multi-SIM capability to Access Point Names 
+ In Settings->More->Cellular networks->AccessPoint Names will display
the APNs for the selected SubscriptionInfo.

Bug: 18246837
Change-Id: If8f46c2fa82cf4b2051ddb5f15afc8c59cb9b850
 2014-12-08 10:48:20 -08:00
Jeff Sharkey
e0d9f74d27 am 14ff2f7c: Merge "Offer to "merge" subscribers for data usage." into lmp-mr1-dev 
* commit '14ff2f7c30b8258807f44afb815ccc71dc574c1c':
  Offer to "merge" subscribers for data usage.
 2014-12-08 18:04:09 +00:00
Jeff Sharkey
14ff2f7c30 Merge "Offer to "merge" subscribers for data usage." into lmp-mr1-dev 2014-12-08 17:57:30 +00:00
PauloftheWest
5acd934b71 am 2a56b194: Merge "SIM cards in Setting will only show on Multi-SIM devices" into lmp-mr1-dev 
* commit '2a56b1943f10beea189fa8ec5478981e6b704b42':
  SIM cards in Setting will only show on Multi-SIM devices
 2014-12-08 17:08:09 +00:00
PauloftheWest
743e825934 am a2f69987: Merge "Fixed a SimSettings issue" into lmp-mr1-dev 
* commit 'a2f699871eb01c6d8464699eb8808c33de15f438':
  Fixed a SimSettings issue
 2014-12-08 17:08:08 +00:00
PauloftheWest
2a56b1943f Merge "SIM cards in Setting will only show on Multi-SIM devices" into lmp-mr1-dev 2014-12-08 17:01:35 +00:00
PauloftheWest
a2f699871e Merge "Fixed a SimSettings issue" into lmp-mr1-dev 2014-12-08 17:01:23 +00:00
John Spurlock
65802e5acb am f68bc645: Settings: Hide downtime settings if not supported. 
* commit 'f68bc6459352cf585b2cbb1c9e0c9b54e1936daa':
  Settings: Hide downtime settings if not supported.
 2014-12-08 16:57:26 +00:00
Jeff Sharkey
4e2d16cdc0 Offer to "merge" subscribers for data usage. 
When picking a template to use for querying statistics and setting
policies, normalize it so we widen the template to cover any merged
subscribers.

Also remove some code related to long-dormant split policies.

Bug: 18012787
Change-Id: I1e07dc09016df21ecfd7b3fad49759fa57570391
 2014-12-08 08:42:12 -08:00
John Spurlock
f68bc64593 Settings: Hide downtime settings if not supported. 
Depends on frameworks/base:
  I4f801018ddb0beb6eb9fa03a81c79f7949888a3f

Bug: 16373455

Change-Id: I88b526d947fb697a7abd4d4cf4225f926434915a
 2014-12-08 11:00:47 -05:00
Geoff Mendal
2193e589ca Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 2014-12-08 14:42:26 +00:00
Geoff Mendal
7f530b3350 Import translations. DO NOT MERGE 
Change-Id: Ib5799918393320abc01ef481068d943b716451f9
Auto-generated-cl: translation import
 2014-12-08 06:41:08 -08:00
Geoff Mendal
be183dacbd am 838d6dc9: (-s ours) Import translations. DO NOT MERGE 
* commit '838d6dc94970201792bc825091c9b520fb96821a':
  Import translations. DO NOT MERGE
 2014-12-08 14:36:05 +00:00
Geoff Mendal
838d6dc949 Import translations. DO NOT MERGE 
Change-Id: I961eb0c06458b16d134c52d5748954f7c359b053
Auto-generated-cl: translation import
 2014-12-08 06:25:15 -08:00
Zoltan Szatmary-Ban
5d653fe85a am f84c6ee0: Merge "Make Location Settings multiprofile aware" into lmp-mr1-dev 
* commit 'f84c6ee01c09b25d78c48cdf6bde5be4e334758c':
  Make Location Settings multiprofile aware
 2014-12-08 12:55:55 +00:00
Zoltan Szatmary-Ban
f84c6ee01c Merge "Make Location Settings multiprofile aware" into lmp-mr1-dev 2014-12-08 12:50:11 +00:00
Lucky Zhang
90ec22bc2c am 07117147: Merge "[FRP] Screen Lock for Setup Wizard shows wrong title" into lmp-mr1-dev 
* commit '071171476aeb869d40a5247e09759d7049cda239':
  [FRP] Screen Lock for Setup Wizard shows wrong title
 2014-12-08 10:11:52 +00:00
Lucky Zhang
3e239fe0d8 am 73ae2d3a: Merge "[FRP] Remove None and Swipe from screen lock options" into lmp-mr1-dev 
* commit '73ae2d3adca786efed712e088b03c520fe7e9790':
  [FRP] Remove None and Swipe from screen lock options
 2014-12-08 10:11:50 +00:00
Lucky Zhang
071171476a Merge "[FRP] Screen Lock for Setup Wizard shows wrong title" into lmp-mr1-dev 2014-12-08 09:32:00 +00:00
Lucky Zhang
73ae2d3adc Merge "[FRP] Remove None and Swipe from screen lock options" into lmp-mr1-dev 2014-12-08 09:31:46 +00:00
Maurice Lam
8fcbe81665 am 400e9378: Merge "[FRP] Don\'t extract IME for PIN / Password during setup" into lmp-mr1-dev 
* commit '400e93785016cce831b14990365ab7636b846648':
  [FRP] Don't extract IME for PIN / Password during setup
 2014-12-06 03:10:19 +00:00
Maurice Lam
400e937850 Merge "[FRP] Don't extract IME for PIN / Password during setup" into lmp-mr1-dev 2014-12-06 03:03:56 +00:00
Lucky Zhang
df8566a9a1 [FRP] Remove None and Swipe from screen lock options 
Removed "None" and "Swipe" from screen lock options in the choosing
lock screen during setup wizard, because at this step, the user has
already chosen to pick a screen lock, hence it's unnecessory to show
"none" and "swipe".

Implemented this by overriding the DisableUnusablePreferences in
SetupChooseLockGenericFragment to disable the insecure lock methods
and adding a flag to hide disabled methods for setup wizard.

Bug: 18631416
Change-Id: I3feccf591da25bd6eadcc03c75b28cfc1d069db7
 2014-12-05 18:50:55 -08:00
Lucky Zhang
36ec274e73 [FRP] Screen Lock for Setup Wizard shows wrong title 
Changed to the string lock_setting_picker_title that says "Choose a
screen lock".

Bug: 18631416
Change-Id: I2e400f3fdf7e89d4e70a60e1aec6df9ed77653b2
 2014-12-05 18:20:27 -08:00
Jeff Davidson
e238176020 am 9dc247bb: Merge "Final platform settings UX for ephemeral networks." into lmp-mr1-dev 
* commit '9dc247bba248ac6329b6e0a5b42ac8ef4c8c4a3e':
  Final platform settings UX for ephemeral networks.
 2014-12-06 02:16:41 +00:00
Jeff Davidson
9dc247bba2 Merge "Final platform settings UX for ephemeral networks." into lmp-mr1-dev 2014-12-06 02:07:31 +00:00
Wink Saville
a4f4d185cf Add debug dataEnable. 
Change-Id: I4c2c49d9283652429affc190abacf7775ef3fe43
 2014-12-05 15:34:46 -08:00
Maurice Lam
53bfcb526b am 7dca460a: Merge "[FRP] Use Lock type as header instead of "Encryption"" into lmp-mr1-dev 
* commit '7dca460af7a6a9d683ea398c6eb2e3f784aa6900':
  [FRP] Use Lock type as header instead of "Encryption"
 2014-12-05 22:12:51 +00:00
Maurice Lam
7dca460af7 Merge "[FRP] Use Lock type as header instead of "Encryption"" into lmp-mr1-dev 2014-12-05 21:57:00 +00:00
Sanket Padawe
32fc975534 am fc988c03: Merge "Removing checks from EnableWifiTether which are done in SystemUI" into lmp-mr1-dev 
* commit 'fc988c03e11eba66ca28f6dbec6d889535638bbb':
  Removing checks from EnableWifiTether which are done in SystemUI
 2014-12-05 21:03:36 +00:00
Sanket Padawe
889d3875af am 6d0059c3: Merge "Change default sim selection text in sim settings ui." into lmp-mr1-dev 
* commit '6d0059c3f998a86b1726949525d3501d5b7cf589':
  Change default sim selection text in sim settings ui.
 2014-12-05 21:03:35 +00:00