Narayan Kamath
206d1d385c
Merge "Stop using apache-http in settings."
2014-12-15 14:35:21 +00:00
Narayan Kamath
7a250b8288
Stop using apache-http in settings.
...
Most of this usage is from crufty "test" code, and is trivially
replacable.
bug: 18027885
(cherry picked from commit f25627c0c9
2014-12-15 14:32:38 +00:00
Zoltan Szatmary-Ban
2960b9392e
Merge "Show removed user's data usage under its correct item"
2014-12-15 11:22:24 +00:00
John Spurlock
3d51b61f6c
am 3eaa3506: am e964060b: am b4805e3a: Settings: Allow more lines of saver feature description text.
...
* commit '3eaa35064a4e5a2eb1c57b465903e36774e27820':
Settings: Allow more lines of saver feature description text.
2014-12-12 20:56:40 +00:00
John Spurlock
3eaa35064a
am e964060b: am b4805e3a: Settings: Allow more lines of saver feature description text.
...
* commit 'e964060b5de4b534431b58c2ac4fae9fdd6baedc':
Settings: Allow more lines of saver feature description text.
2014-12-12 19:08:46 +00:00
Zoltan Szatmary-Ban
cd9b1507fb
Show removed user's data usage under its correct item
...
Users for which UserManager.getUserInfo returned null were shown as
unnamed users on Settings > Data Usage. This behavior has now changed
to show their data usage under the same item as UID_REMOVED.
Bug: 18174376
Change-Id: I8d172647edb51f7a277b4b714e9b7f3a0b5f3154
2014-12-12 18:48:03 +00:00
John Spurlock
b4805e3a34
Settings: Allow more lines of saver feature description text.
...
Bug: 18706906
Change-Id: I27bfd5e70c3e20c17fcad691cfb3c9f74d7d0390
2014-12-12 12:54:48 -05:00
Wink Saville
47a05fc45b
am f5d6dd6a: am 8a21ab00: Merge "Change tests against INVALID_SUBSCRIPTION_ID to use isValidSubscriptionId." into lmp-mr1-dev automerge: fc748fe
...
* commit 'f5d6dd6a11ef0fd7518ba5905571c714e4b2df33':
Change tests against INVALID_SUBSCRIPTION_ID to use isValidSubscriptionId.
2014-12-12 04:48:31 +00:00
Wink Saville
f5d6dd6a11
am 8a21ab00: Merge "Change tests against INVALID_SUBSCRIPTION_ID to use isValidSubscriptionId." into lmp-mr1-dev
...
automerge: fc748fe
2014-12-12 04:42:28 +00:00
Wink Saville
d72c062fa8
Change tests against INVALID_SUBSCRIPTION_ID to use isValidSubscriptionId.
...
Bug: 18668873
Change-Id: Ie709a62bbb74e0a767daeb9e3fb3aecd4c45df44
2014-12-11 10:10:05 -08:00
Zoltan Szatmary-Ban
d2acd90533
am 1162cf30: Merge "Bring up correct app for Recent location list items" into lmp-mr1-dev automerge: 25a1181 automerge: d0831ae
...
* commit '1162cf3084c6e077e2a0cafb831fe16a18e0be62':
Bring up correct app for Recent location list items
2014-12-11 18:07:36 +00:00
PauloftheWest
2ad430e742
am e391e713: Merge "Disabled SIM notifications while provisioning." into lmp-mr1-dev automerge: 209c946 automerge: 13028d1
...
* commit 'e391e713cb34648ad6fc9d3f7336c574acc4787c':
Disabled SIM notifications while provisioning.
2014-12-11 18:07:34 +00:00
Zoltan Szatmary-Ban
1162cf3084
Merge "Bring up correct app for Recent location list items" into lmp-mr1-dev automerge: 25a1181
...
automerge: d0831ae
2014-12-11 18:02:29 +00:00
PauloftheWest
e391e713cb
Merge "Disabled SIM notifications while provisioning." into lmp-mr1-dev automerge: 209c946
...
automerge: 13028d1
2014-12-11 18:02:17 +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
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
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
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
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
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
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
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
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
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
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
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
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
