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
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
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
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
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
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
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
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
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
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
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
2014-12-09 23:16:30 +00:00
John Spurlock
f7f6aaeff7
am 65802e5a: am f68bc645: Settings: Hide downtime settings if not supported.
...
automerge: d888715
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
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
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
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
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
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
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
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
Justin Harrison
15f8bf6278
am de54a3ae: am 9704e3d6: am 03cceb32: Merge "Removed the application SIM Cards from application list" into lmp-mr1-dev
...
* commit 'de54a3aef60f2d3d1f143ba5bb1ecdd4b9cf3a9e':
Removed the application SIM Cards from application list
2014-12-09 00:55:39 +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
Maurice Lam
2e07b9e83e
am 5d7cef31: am b6f5e003: am 13989d6d: Merge "[FRP] Give pattern lock colors" into lmp-mr1-dev
...
* commit '5d7cef31bc9aede1ebe2ce64906b2a7766d94c99':
[FRP] Give pattern lock colors
2014-12-09 00:55:36 +00:00
