PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
19,233 Commits 1 Branch 0 Tags
10045bc2f16b0a43d7228bfb86d6cd9b72d26b12
Commit Graph

7773 Commits

Author SHA1 Message Date
Alexandra Gherghina
4b9be76b1d am 0d04d8cb: am 32ca6f1f: Merge "Fix NPE in Running Processes view in Apps Settings" into lmp-mr1-dev 
automerge: a8f7074

* commit 'a8f70740c495f7d3f47db65bb08ccdb58c52b178':
  Fix NPE in Running Processes view in Apps Settings
 2014-12-10 22:28:34 +00:00
Emily Bernier
ff7c75cd17 am b366a286: am 5a528b27: Merge "Listen for CONNECTIVITY_ACTION broadcasts in WifiSetupActivity" into lmp-mr1-dev 
automerge: 7a3b253

* commit '7a3b253f086150ab030db967862002795a29bb83':
  Listen for CONNECTIVITY_ACTION broadcasts in WifiSetupActivity
 2014-12-10 22:28:17 +00:00
Alexandra Gherghina
a8f70740c4 am 0d04d8cb: am 32ca6f1f: Merge "Fix NPE in Running Processes view in Apps Settings" into lmp-mr1-dev 
* commit '0d04d8cbe8754e75a429f851d0d5a1b14829688b':
  Fix NPE in Running Processes view in Apps Settings
 2014-12-10 22:23:57 +00:00
Emily Bernier
7a3b253f08 am b366a286: am 5a528b27: Merge "Listen for CONNECTIVITY_ACTION broadcasts in WifiSetupActivity" into lmp-mr1-dev 
* commit 'b366a286b869890ebbf59f2400c37c97661fe8fa':
  Listen for CONNECTIVITY_ACTION broadcasts in WifiSetupActivity
 2014-12-10 22:23:54 +00:00
Stuart Scott
b3dd601286 Show toast when cellular data option is changing. 
bug: 18594162
Change-Id: I19dc265af47c0a40a6ace6d4bf42e21e035daf0a
 2014-12-10 13:31:36 -08:00
PauloftheWest
ab88ad9381 Merge "Fixed a Data Usage crash" into lmp-mr1-dev 2014-12-10 21:16:10 +00:00
Alexandra Gherghina
32ca6f1fbf Merge "Fix NPE in Running Processes view in Apps Settings" into lmp-mr1-dev 2014-12-10 17:42:42 +00:00
PauloftheWest
f0d84e2e53 Fixed a Data Usage crash 
Bug: 18364933
Change-Id: I80657c6541aec0b4706ef4aa229c9f858776aab2
 2014-12-10 09:38:02 -08:00
Emily Bernier
5a528b274f Merge "Listen for CONNECTIVITY_ACTION broadcasts in WifiSetupActivity" into lmp-mr1-dev 2014-12-10 17:25:15 +00:00
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
acb6229507 am 0fde6bb9: Merge "[FRP] Shrink lock screen when keyboard pops up" into lmp-mr1-dev automerge: e0f637a 
automerge: 4eaf999

* commit '4eaf999a540d31e1caacd5edf29b7e6ab75f6c11':
  [FRP] Shrink lock screen when keyboard pops up
 2014-12-10 03:39:03 +00:00
Maurice Lam
4eaf999a54 am 0fde6bb9: Merge "[FRP] Shrink lock screen when keyboard pops up" into lmp-mr1-dev automerge: e0f637a 
* commit '0fde6bb98a6e22088a53560f60b17cc824b8098f':
  [FRP] Shrink lock screen when keyboard pops up
 2014-12-10 03:34:02 +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
06954be683 am aa800609: Merge "Added Multi-SIM capability to Access Point Names" into lmp-mr1-dev automerge: 58a73bb 
automerge: 01c6a56

* commit '01c6a56c1623a4858d1a28ada0fdc0d7f87b935e':
  Added Multi-SIM capability to Access Point Names
 2014-12-09 23:22:46 +00:00
PauloftheWest
510f4b4d69 am e6d7b31f: Merge "Fixed a SIM Lock UI issue" into lmp-mr1-dev automerge: bfb8449 
automerge: 05275af

* commit '05275aff0ad8fd1b90786fa62ed0372ed4d86035':
  Fixed a SIM Lock UI issue
 2014-12-09 23:22:36 +00:00
PauloftheWest
01c6a56c16 am aa800609: Merge "Added Multi-SIM capability to Access Point Names" into lmp-mr1-dev 
automerge: 58a73bb

* commit '58a73bbc0a6df6157531dc94cc305cd3a9922041':
  Added Multi-SIM capability to Access Point Names
 2014-12-09 23:22:10 +00:00
PauloftheWest
05275aff0a am e6d7b31f: Merge "Fixed a SIM Lock UI issue" into lmp-mr1-dev 
automerge: bfb8449

* commit 'bfb8449aea4d6ac7e4b6c21e28faa49344f93806':
  Fixed a SIM Lock UI issue
 2014-12-09 23:20:25 +00:00
Wink Saville
fff0617959 am f8c4fe2d: am 85d3b0fa: Merge "Add debug dataEnable." into lmp-mr1-dev 
automerge: da77fcf

* commit 'da77fcf428dc70826fe4a8789193660563a831f3':
  Add debug dataEnable.
 2014-12-09 23:17:15 +00:00
Prem Kumar
c63471753f am 35b3257e: am 1e1251cc: Merge "Fixed a SIM Cards crash." into lmp-mr1-dev 
automerge: 5c8dff3

* commit '5c8dff3e92105dfa861cb2fb1bde8b57fea6e381':
  Fixed a SIM Cards crash.
 2014-12-09 23:17:07 +00:00
John Spurlock
d876825c0f am 8aa3e663: am 1e3be7d9: Merge "Settings: Rebind to volume sliders after returning from stopped." into lmp-mr1-dev 
automerge: 195b9c8

* commit '195b9c855ad107b8205fef37dd187a1df7695230':
  Settings: Rebind to volume sliders after returning from stopped.
 2014-12-09 23:16:56 +00:00
Jeff Sharkey
8a5762d684 am e0d9f74d: am 14ff2f7c: Merge "Offer to "merge" subscribers for data usage." into lmp-mr1-dev 
automerge: e5c7bae

* commit 'e5c7baec2b6b26811531fa6622711ca970e5ca77':
  Offer to "merge" subscribers for data usage.
 2014-12-09 23:16:47 +00:00
PauloftheWest
900bdb3388 am 5acd934b: am 2a56b194: Merge "SIM cards in Setting will only show on Multi-SIM devices" into lmp-mr1-dev 
automerge: d54211c

* commit 'd54211c76de5cd0c7e45effbdb2bfdf0081fc94c':
  SIM cards in Setting will only show on Multi-SIM devices
 2014-12-09 23:16:39 +00:00
PauloftheWest
6c85187a5d am 743e8259: am a2f69987: Merge "Fixed a SimSettings issue" into lmp-mr1-dev 
automerge: 6f55eb7

* commit '6f55eb72f4a0ec55c0c635f36d678a105706c1fd':
  Fixed a SimSettings issue
 2014-12-09 23:16:30 +00:00
John Spurlock
f7f6aaeff7 am 65802e5a: am f68bc645: Settings: Hide downtime settings if not supported. 
automerge: d888715

* commit 'd88871564f3df3325f6a683d8f2baad5b043b1d6':
  Settings: Hide downtime settings if not supported.
 2014-12-09 23:16:22 +00:00
Zoltan Szatmary-Ban
77d7e17fba am 5d653fe8: am f84c6ee0: Merge "Make Location Settings multiprofile aware" into lmp-mr1-dev 
automerge: 45f0423

* commit '45f04233c22231d3216ceb9a1a7cc5b09cf45401':
  Make Location Settings multiprofile aware
 2014-12-09 23:15:46 +00:00
Lucky Zhang
64192c36fa am 3e239fe0: am 73ae2d3a: Merge "[FRP] Remove None and Swipe from screen lock options" into lmp-mr1-dev 
automerge: a4df967

* commit 'a4df9673896bf7fb317b8ae92246b555d712a79d':
  [FRP] Remove None and Swipe from screen lock options
 2014-12-09 23:15:29 +00:00
Jeff Davidson
06b65d1c7d resolve merge conflicts of 0c7e4ed to master. 
Change-Id: I6c5625564f69769eb6f61d3df7531f032080d0d9
 2014-12-09 15:11:44 -08: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
da77fcf428 am f8c4fe2d: am 85d3b0fa: Merge "Add debug dataEnable." into lmp-mr1-dev 
* commit 'f8c4fe2d3c0281243fd246c00c1d460e891b386e':
  Add debug dataEnable.
 2014-12-09 18:05:56 +00:00
Wink Saville
85d3b0fa6e Merge "Add debug dataEnable." into lmp-mr1-dev 2014-12-09 17:52:20 +00:00
Prem Kumar
5c8dff3e92 am 35b3257e: am 1e1251cc: Merge "Fixed a SIM Cards crash." into lmp-mr1-dev 
* commit '35b3257e078ea2609a2e5ef28019b92349f6b41b':
  Fixed a SIM Cards crash.
 2014-12-09 11:29:22 +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
1e1251cc04 Merge "Fixed a SIM Cards crash." into lmp-mr1-dev 2014-12-09 02:25:15 +00:00
Maurice Lam
2a321adc9b am 2dded568: am 53bfcb52: am 7dca460a: Merge "[FRP] Use Lock type as header instead of "Encryption"" into lmp-mr1-dev 
* commit '2dded568fe0afbc18dda0a5abd0afa6911558dee':
  [FRP] Use Lock type as header instead of "Encryption"
 2014-12-09 00:55:49 +00:00
Sanket Padawe
8b8ae61d52 am 088a4420: am 32fc9755: am fc988c03: Merge "Removing checks from EnableWifiTether which are done in SystemUI" into lmp-mr1-dev 
* commit '088a44205d2b4a7c2add44f9109f209b50c0f3b9':
  Removing checks from EnableWifiTether which are done in SystemUI
 2014-12-09 00:55:48 +00:00
Sanket Padawe
ded7054794 am 361681e2: am 889d3875: am 6d0059c3: Merge "Change default sim selection text in sim settings ui." into lmp-mr1-dev 
* commit '361681e2579f36765c1a75d7898f73b0fd2c1322':
  Change default sim selection text in sim settings ui.
 2014-12-09 00:55:47 +00:00
Justin Harrison
3cb00b23aa am 765bf45f: am 07d60e5e: am 0612a485: Merge "Check remote device uuids for phone book access permission" into lmp-mr1-dev 
* commit '765bf45f9714f0857bc0de081ed9c938ebf810f5':
  Check remote device uuids for phone book access permission
 2014-12-09 00:55:45 +00:00
Fyodor Kupolov
ed682b7f18 am 2b6c7313: am d7e3f354: am d4057cc3: Merge "Update list on ACTION_DEVICE_POLICY_MANAGER_STATE_CHANGED" into lmp-mr1-dev 
* commit '2b6c7313ede33b40515f41ea97d3bed0532d1518':
  Update list on ACTION_DEVICE_POLICY_MANAGER_STATE_CHANGED
 2014-12-09 00:55:44 +00:00
Shishir Agrawal
5615a1b3b6 am 4d3eb665: am 5cfc97a9: am 0b1f606c: Merge "Settings app - read phone number from TelephonyManager." into lmp-mr1-dev 
* commit '4d3eb6659eb6626dd3ed5d46b681ddf27845a4fe':
  Settings app - read phone number from TelephonyManager.
 2014-12-09 00:55:43 +00:00
Adrian Roos
19805a3cca am 669dd0a3: am f39a0988: am 5df6e030: Merge "Fix race leading to spuriously disabled trust agents" into lmp-mr1-dev 
* commit '669dd0a3aa916994fb821e7036e7c4bd12a033a1':
  Fix race leading to spuriously disabled trust agents
 2014-12-09 00:55:41 +00:00
Maurice Lam
4dd6de9228 am 5c325c4d: am ecf2f401: am 2c0c9837: Merge "[FRP] Use setup wizard nav bar buttons" into lmp-mr1-dev 
* commit '5c325c4d8cd9a0c1195b3d02b31f6073fbff09a2':
  [FRP] Use setup wizard nav bar buttons
 2014-12-09 00:55:40 +00:00
Maurice Lam
10a4d5c2de am 3d9267f3: am 40a252ce: am dfaf4c92: Merge "[FRP] Add illustration to lock screen setup" into lmp-mr1-dev 
* commit '3d9267f307ea484a46b95c80ac501fc4ee1fc4c2':
  [FRP] Add illustration to lock screen setup
 2014-12-09 00:55:37 +00:00
John Spurlock
195b9c855a am 8aa3e663: am 1e3be7d9: Merge "Settings: Rebind to volume sliders after returning from stopped." into lmp-mr1-dev 
* commit '8aa3e66389e7b66424ca7b4a3c0ef9cc11a00b17':
  Settings: Rebind to volume sliders after returning from stopped.
 2014-12-09 00:23:28 +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