Jason Monk
b0c8c3935d
Merge "Add a periodic check of the tethering provisioning" into lmp-mr1-dev
2014-12-16 15:44:27 +00:00
Sanket Padawe
506c13fd30
am ccb9fcfa: am 996724ea: am 7131f1a9: Merge "Prevent sim notify popup after upgrade from k to LMR1." into lmp-mr1-dev
...
* commit 'ccb9fcfa1fa6d19e8d7ce60c592e4338d4a3575c':
Prevent sim notify popup after upgrade from k to LMR1.
2014-12-16 11:02:49 +00:00
Sanket Padawe
38f3eacf21
am 622fe174: am b92f3368: am d0591276: Merge "Exiting activity on clicking outside dialog acitivity." into lmp-mr1-dev
...
* commit '622fe17483874f98b0a2bba56bcc2bfea6f416cd':
Exiting activity on clicking outside dialog acitivity.
2014-12-16 11:02:45 +00:00
Sanket Padawe
ccb9fcfa1f
am 996724ea: am 7131f1a9: Merge "Prevent sim notify popup after upgrade from k to LMR1." into lmp-mr1-dev
...
* commit '996724ea6d121bf5aa75f1779fc7337b0fa3f0c9':
Prevent sim notify popup after upgrade from k to LMR1.
2014-12-16 03:00:41 +00:00
Sanket Padawe
622fe17483
am b92f3368: am d0591276: Merge "Exiting activity on clicking outside dialog acitivity." into lmp-mr1-dev
...
* commit 'b92f336886f34358f122ed101c082ccca7a44c79':
Exiting activity on clicking outside dialog acitivity.
2014-12-16 03:00:39 +00:00
Fyodor Kupolov
1b5cc427f0
Disable CryptKeeper activity for secondary users
...
For secondary users, disable CryptKeeper activity in a broadcast receiver of
USER_INITIALIZE intent. This change has the following benefits for guest
user switching:
- The code will be executed earlier in the user switching flow, when the
screen is frozen by WindowManager.
- Initialization of CryptKeeperActivity is skipped
Bug:18670536
Change-Id: I60300198b605c26ad15afe2c874d5f1be7da5087
2014-12-16 02:48:36 +00:00
Sanket Padawe
7131f1a99c
Merge "Prevent sim notify popup after upgrade from k to LMR1." into lmp-mr1-dev
2014-12-16 02:42:29 +00:00
Sanket Padawe
d059127659
Merge "Exiting activity on clicking outside dialog acitivity." into lmp-mr1-dev
2014-12-16 02:42:17 +00:00
PauloftheWest
7dd0de5382
am 5200f61e: am c6f5c924: Merge "Fixed then icons of SIMs in the call dialog." into lmp-mr1-dev automerge: 735e93e
...
* commit '5200f61ede468ce782a0ae7a71df07ce948fb7f6':
Fixed then icons of SIMs in the call dialog.
2014-12-16 01:48:19 +00:00
PauloftheWest
5200f61ede
am c6f5c924: Merge "Fixed then icons of SIMs in the call dialog." into lmp-mr1-dev
...
automerge: 735e93e
2014-12-16 01:41:48 +00:00
Wink Saville
0bf96d604f
am 6ac0cef0: am 870a2a8e: am e04fd76f: Merge "Use getLIn1NumberForSubscriber to get phone number." into lmp-mr1-dev
...
* commit '6ac0cef01b655de3665e8750566fa10dac0e5697':
Use getLIn1NumberForSubscriber to get phone number.
2014-12-15 22:47:01 +00:00
Stuart Scott
997a734faa
am e84524ef: am 56db3f35: am b62bfe71: Merge "Show toast when cellular data option is changing." into lmp-mr1-dev
...
* commit 'e84524efc86517766797fd1614093c08dcb60b2c':
Show toast when cellular data option is changing.
2014-12-15 22:47:00 +00:00
PauloftheWest
c6f5c924d8
Merge "Fixed then icons of SIMs in the call dialog." into lmp-mr1-dev
2014-12-15 22:46:58 +00:00
Wink Saville
6ac0cef01b
am 870a2a8e: am e04fd76f: Merge "Use getLIn1NumberForSubscriber to get phone number." into lmp-mr1-dev
...
* commit '870a2a8ea85670dafdcd9d8617e0c99862f0604d':
Use getLIn1NumberForSubscriber to get phone number.
2014-12-15 22:41:53 +00:00
Stuart Scott
e84524efc8
am 56db3f35: am b62bfe71: Merge "Show toast when cellular data option is changing." into lmp-mr1-dev
...
* commit '56db3f35eba2dae6463ac981822d8fe80fc6d189':
Show toast when cellular data option is changing.
2014-12-15 22:41:52 +00:00
PauloftheWest
7d46a4c9fe
am d9396835: am 29db97d1: am 682b7ed3: Merge "IMEI information will show without a SIM." into lmp-mr1-dev
...
* commit 'd9396835770cbfa25c28a04e0f0bdcdf91d78a33':
IMEI information will show without a SIM.
2014-12-15 22:22:19 +00:00
PauloftheWest
d939683577
am 29db97d1: am 682b7ed3: Merge "IMEI information will show without a SIM." into lmp-mr1-dev
...
* commit '29db97d1189a885324d950ecb3a2e80d1eabaece':
IMEI information will show without a SIM.
2014-12-15 21:45:37 +00:00
Sanket Padawe
9b566a0924
Prevent sim notify popup after upgrade from k to LMR1.
...
Bug: 18705619
Change-Id: I6de4d20172c69358c1853e6a00c68fc353c7dad7
2014-12-15 13:26:27 -08:00
Wink Saville
e04fd76f1c
Merge "Use getLIn1NumberForSubscriber to get phone number." into lmp-mr1-dev
2014-12-15 20:45:00 +00:00
Wink Saville
c47f8db374
Use getLIn1NumberForSubscriber to get phone number.
...
Bug: 18721557
Change-Id: I255627638efe21362315286a659ac59b46e1fa30
Signed-off-by: Wink Saville <wink@google.com >
2014-12-15 12:04:29 -08:00
Stuart Scott
b62bfe7155
Merge "Show toast when cellular data option is changing." into lmp-mr1-dev
2014-12-15 19:43:19 +00:00
Lucky Zhang
e421f609eb
am a6f6e5a3: am 03f336d0: am 5f17119f: Merge "[FRP] Notification screen slides in wrong direction" into lmp-mr1-dev
...
* commit 'a6f6e5a35be333921f47d768d053054280552fa5':
[FRP] Notification screen slides in wrong direction
2014-12-15 18:46:24 +00:00
PauloftheWest
c8bcf2985a
IMEI information will show without a SIM.
...
Bug: 18701340
Change-Id: I1e92bd1af4d68849f194d30b5b894cfb144900e5
2014-12-15 10:29:54 -08:00
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
