PauloftheWest
68b93e68e2
am 1a5d132f: am 3e864c0b: Merge "Removed extraneous slot information on single SIM devices." into lmp-mr1-dev
...
* commit '1a5d132fcbf6a00c500fb7031a1f15e0328e7dcb':
Removed extraneous slot information on single SIM devices.
2014-12-19 23:03:11 +00:00
PauloftheWest
3e864c0bda
Merge "Removed extraneous slot information on single SIM devices." into lmp-mr1-dev
2014-12-19 22:53:03 +00:00
PauloftheWest
a68bdb6dbe
Removed extraneous slot information on single SIM devices.
...
Bug: 18803333
Change-Id: If18f898839a1b7927a8db3b225549d4e4e073fdc
2014-12-18 15:02:39 -08:00
Sanket Padawe
ec3f7998db
am eec0c11a: am 19627ca2: Getting mcc/mnc from system prop instead of subInfoRecord.
...
* commit 'eec0c11ae3386284dd6797076764572efeca52c3':
Getting mcc/mnc from system prop instead of subInfoRecord.
2014-12-18 18:43:55 +00:00
Sanket Padawe
19627ca215
Getting mcc/mnc from system prop instead of subInfoRecord.
...
Bug: 18781129
Change-Id: Idb4c70c9b936a947460e6c6d03bd40dc2ae4279a
2014-12-18 10:29:16 -08:00
Sanket Padawe
25f2cfe94e
am 72cedc7a: am c4cc07b2: Merge "Revert "Getting mcc/mnc from system prop instead of subInfoRecord."" into lmp-mr1-dev
...
* commit '72cedc7af53483dea41eb391613b94b6f0a7226e':
Revert "Getting mcc/mnc from system prop instead of subInfoRecord."
2014-12-18 06:38:28 +00:00
Sanket Padawe
4be06d9c48
Revert "Getting mcc/mnc from system prop instead of subInfoRecord."
...
This reverts commit 579b66f28d
2014-12-18 06:24:36 +00:00
Sanket Padawe
2497b44ab0
am cff282f3: am 080674e6: Merge "Getting mcc/mnc from system prop instead of subInfoRecord." into lmp-mr1-dev
...
* commit 'cff282f3fc81c401a873cdf87ff399b8be28f90b':
Getting mcc/mnc from system prop instead of subInfoRecord.
2014-12-18 05:04:12 +00:00
Sanket Padawe
579b66f28d
Getting mcc/mnc from system prop instead of subInfoRecord.
...
Bug: 18781129
Change-Id: Idefe2dfc26bef2bba2b5b1792bb5ac43a44aa6cc
2014-12-17 19:31:30 -08:00
Jason Monk
c0ecaeefe8
am 5aaa4b63: am b0c8c393: Merge "Add a periodic check of the tethering provisioning" into lmp-mr1-dev
...
* commit '5aaa4b63bd6ee0639ee067e3287e5d97b692a444':
Add a periodic check of the tethering provisioning
2014-12-16 17:05:14 +00:00
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
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
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
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
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
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
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
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
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
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
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
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
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
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
