PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
18,862 Commits 1 Branch 0 Tags
ae6ea36822dca031facb1c502aa9d527ceba658c
Commit Graph

18862 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
b366a286b8 am 5a528b27: Merge "Listen for CONNECTIVITY_ACTION broadcasts in WifiSetupActivity" into lmp-mr1-dev 
* commit '5a528b274f010c2aec5f188c620fabf674aa2637':
  Listen for CONNECTIVITY_ACTION broadcasts in WifiSetupActivity
 2014-12-10 17:34:53 +00:00
Emily Bernier
5a528b274f Merge "Listen for CONNECTIVITY_ACTION broadcasts in WifiSetupActivity" into lmp-mr1-dev 2014-12-10 17:25:15 +00:00
Geoff Mendal
1d2c2a285f Import translations. DO NOT MERGE 
Change-Id: If8d0a895b2fc4715a94e2d0427946d167819aa02
Auto-generated-cl: translation import
 2014-12-10 06:50:35 -08:00
Geoff Mendal
e73fa6afcd Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 2014-12-10 14:47:32 +00:00
Geoff Mendal
38fa3d2fde Import translations. DO NOT MERGE 
Change-Id: I3101f0a9a789a2cb20115e66f88ca96374594888
Auto-generated-cl: translation import
 2014-12-10 06:39:51 -08:00
Geoff Mendal
e111474b0f am 26b04765: (-s ours) Import translations. DO NOT MERGE 
* commit '26b0476586b736c25ddbe0c5f39793c5e5633a67':
  Import translations. DO NOT MERGE
 2014-12-10 14:37:23 +00:00
Geoff Mendal
26b0476586 Import translations. DO NOT MERGE 
Change-Id: I7bab4568e3a20facc24f3a09d337076e07d5d7ad
Auto-generated-cl: translation import
 2014-12-10 06:24:00 -08: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
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
Andreas Gampe
7c8f8ebf5c Merge branch 'master' of https://googleplex-android.googlesource.com/_direct/platform/packages/apps/Settings 2014-12-09 23:24:12 +00: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
Santos Cordon
e3559628b7 Merge branch 'master' of https://googleplex-android.googlesource.com/_direct/platform/packages/apps/Settings 2014-12-09 23:21:11 +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
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
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
Jeff Sharkey
dd91cf0ec4 am e5c7baec: am e0d9f74d: am 14ff2f7c: Merge "Offer to "merge" subscribers for data usage." into lmp-mr1-dev 
* commit 'e5c7baec2b6b26811531fa6622711ca970e5ca77':
  Offer to "merge" subscribers for data usage.
 2014-12-09 23:16:36 +00:00
PauloftheWest
4ab1d176cd am d54211c7: am 5acd934b: am 2a56b194: Merge "SIM cards in Setting will only show on Multi-SIM devices" into lmp-mr1-dev 
* commit 'd54211c76de5cd0c7e45effbdb2bfdf0081fc94c':
  SIM cards in Setting will only show on Multi-SIM devices
 2014-12-09 23:16:34 +00:00
PauloftheWest
a2103c0662 am 6f55eb72: am 743e8259: am a2f69987: Merge "Fixed a SimSettings issue" into lmp-mr1-dev 
* commit '6f55eb72f4a0ec55c0c635f36d678a105706c1fd':
  Fixed a SimSettings issue
 2014-12-09 23:16:33 +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
Geoff Mendal
830f8b347b am 2193e589: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 
automerge: 5e83309  -s ours

* commit '5e833090d82d9c32a62616710c1482129b4f6fd1':
  Import translations. DO NOT MERGE
 2014-12-09 23:16:02 +00:00
Geoff Mendal
2537275ac1 am be183dac: (-s ours) am 838d6dc9: (-s ours) Import translations. DO NOT MERGE 
automerge: 63f6520  -s ours

* commit '63f6520ce9dacd9c99fb5d5e53c42ca5df869167':
  Import translations. DO NOT MERGE
 2014-12-09 23:15:54 +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
a62e42be14 am 90ec22bc: am 07117147: Merge "[FRP] Screen Lock for Setup Wizard shows wrong title" into lmp-mr1-dev 
automerge: 44f44a0

* commit '44f44a0c54a8467307b55f244866e67bf48d3d62':
  [FRP] Screen Lock for Setup Wizard shows wrong title
 2014-12-09 23:15:37 +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
Maurice Lam
00a89f1439 am 8fcbe816: am 400e9378: Merge "[FRP] Don\'t extract IME for PIN / Password during setup" into lmp-mr1-dev 
automerge: 86ed2cf

* commit '86ed2cf33fa82aac1606e2a6e217fdff4ef6ef8f':
  [FRP] Don't extract IME for PIN / Password during setup
 2014-12-09 23:15:21 +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
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
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
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
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