Narayan Kamath
62d35b65f2
resolved conflicts for merge of fa893886 to lmp-mr1-dev-plus-aosp
...
Change-Id: Iaf57dd96ab10c3f03a964fed593571895ea7be3a
2014-12-15 16:27:39 +00:00
Alexandra Gherghina
cee402a5f4
Make spinner icons circular
...
Bug: 18311493
Change-Id: I73bd3951e2613254c1db3e8c0f2f1d174e1e4b6c
2014-12-15 15:53:47 +00:00
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
903fa3f8eb
Badge items in Settings > Apps > Running correctly
...
That is, add a badge if the item belongs to a managed profile and
do not add if it belongs to the primary.
Bug: 18235061
Change-Id: Ice599b30cd2827180c21c8d0601af7f30b46e94b
2014-12-15 14:28:39 +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
Lucky Zhang
a6f6e5a35b
am 03f336d0: am 5f17119f: Merge "[FRP] Notification screen slides in wrong direction" into lmp-mr1-dev
...
* commit '03f336d07c055b6870dd18ab0096f9e5b085ff51':
[FRP] Notification screen slides in wrong direction
2014-12-13 00:29:43 +00:00
Lucky Zhang
5f17119f46
Merge "[FRP] Notification screen slides in wrong direction" into lmp-mr1-dev
2014-12-13 00:15:32 +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
PauloftheWest
a886d69f9d
Fixed then icons of SIMs in the call dialog.
...
Bug: 18672758
Change-Id: I812e79a48b048f8449cc07fdcccab57a114cdd24
2014-12-12 12:21:17 -08: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
Narayan Kamath
f25627c0c9
Stop using apache-http in settings.
...
Most of this usage is from crufty "test" code, and is trivially
replacable.
bug: 18027885
Change-Id: If4441a5e76405eba068479a4dcaa6012b5a74cbf
2014-12-12 14:22:06 +00: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
Lucky Zhang
47811fe057
[FRP] Notification screen slides in wrong direction
...
The method that launches notification screen from choose lock activity
finished the original activity before starting the new activity. This
made the system think it is a backward transition instead of a forward
one. Swapping the order to start new activity first and then finish
old activity fixed the problem.
This also changes the behavior in settings. However, it seems like this
is also the desired behavior for settings.
Bug: 18723199
Change-Id: I90538fa52e0d62a2274c8e0333682035849802c6
2014-12-11 18:10:01 -08:00
Sanket Padawe
75e0082ae8
Exiting activity on clicking outside dialog acitivity.
...
Bug: 18705619
Change-Id: I50cb08884f1c97352f5ad3a3e7d218b42af1ada4
2014-12-11 14:36:26 -08:00
Jason Monk
37832d661a
Add a periodic check of the tethering provisioning
...
Add a service that handles the check through broadcasts which are
defined through configs, similar to the previous configs for the
activity.
Depends on I1f6e2d954562c5a16a0de60dac625005ec3e5c50
Bug: 18453076
Change-Id: I515d72706e9ca37877e67c44427af1b75b146390
2014-12-11 15:07:45 -05: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
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
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
