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

18882 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
PauloftheWest
e391e713cb Merge "Disabled SIM notifications while provisioning." into lmp-mr1-dev automerge: 209c946 
automerge: 13028d1

* commit '13028d1d90a995b71999ee7c00f04adabd9cb7ff':
  Disabled SIM notifications while provisioning.
 2014-12-11 18:02:17 +00:00
Zoltan Szatmary-Ban
d0831ae214 Merge "Bring up correct app for Recent location list items" into lmp-mr1-dev 
automerge: 25a1181

* commit '25a1181f2a61d32481e7c66f96c2abf7aebd761e':
  Bring up correct app for Recent location list items
 2014-12-11 15:09:56 +00:00
PauloftheWest
13028d1d90 Merge "Disabled SIM notifications while provisioning." into lmp-mr1-dev 
automerge: 209c946

* commit '209c9465b3251c0a5e652214e402b1a54df234f9':
  Disabled SIM notifications while provisioning.
 2014-12-11 15:09:31 +00:00
Zoltan Szatmary-Ban
25a1181f2a Merge "Bring up correct app for Recent location list items" into lmp-mr1-dev 2014-12-11 13:23:30 +00:00
PauloftheWest
209c9465b3 Merge "Disabled SIM notifications while provisioning." into lmp-mr1-dev 2014-12-11 13:14:07 +00:00
PauloftheWest
fe3b679090 am 87015c01: am ab88ad93: Merge "Fixed a Data Usage crash" into lmp-mr1-dev 
automerge: 6a8b163

* commit '6a8b1634c053192d2abfdd8f1e0f5df9aecbf216':
  Fixed a Data Usage crash
 2014-12-11 00:11:24 +00:00
PauloftheWest
6a8b1634c0 am 87015c01: am ab88ad93: Merge "Fixed a Data Usage crash" into lmp-mr1-dev 
* commit '87015c0166d84b86fd1067f7e4effbe898b60c7c':
  Fixed a Data Usage crash
 2014-12-11 00:07:03 +00:00
PauloftheWest
5b3da0cc30 Disabled SIM notifications while provisioning. 
Bug: 18672853
Change-Id: I01ba2927ad013649f13b959354a6493ba057e09f
 2014-12-10 15:00:27 -08:00
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
Geoff Mendal
e80efe05f4 am e73fa6af: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 
automerge: bf09ae7  -s ours

* commit 'bf09ae787b811733c5b719404d89e296ca92a574':
  Import translations. DO NOT MERGE
 2014-12-10 22:27:38 +00:00
Geoff Mendal
641825a8c4 am e111474b: (-s ours) am 26b04765: (-s ours) Import translations. DO NOT MERGE 
automerge: d580efb  -s ours

* commit 'd580efb9336d13feff1b1ab236ae2f026434c386':
  Import translations. DO NOT MERGE
 2014-12-10 22:27:29 +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
Geoff Mendal
bf09ae787b am e73fa6af: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 
* commit 'e73fa6afcd3f2890abf5a98107ff5387a0165ebc':
  Import translations. DO NOT MERGE
 2014-12-10 22:22:35 +00:00
Geoff Mendal
d580efb933 am e111474b: (-s ours) am 26b04765: (-s ours) Import translations. DO NOT MERGE 
* commit 'e111474b0fa936821b7fad36506dc8e91a85eb23':
  Import translations. DO NOT MERGE
 2014-12-10 22:22:34 +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
87015c0166 am ab88ad93: Merge "Fixed a Data Usage crash" into lmp-mr1-dev 
* commit 'ab88ad9381dda4afe59d00966cb783426f5f44a3':
  Fixed a Data Usage crash
 2014-12-10 21:24:59 +00:00
PauloftheWest
ab88ad9381 Merge "Fixed a Data Usage crash" into lmp-mr1-dev 2014-12-10 21:16:10 +00:00
Alexandra Gherghina
0d04d8cbe8 am 32ca6f1f: Merge "Fix NPE in Running Processes view in Apps Settings" into lmp-mr1-dev 
* commit '32ca6f1fbf2b9698afe99ad387580b38d07b50ca':
  Fix NPE in Running Processes view in Apps Settings
 2014-12-10 17:47:14 +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
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