Prem Kumar
70c4a7b145
am 531127a5: Merge "SIM Status now shows data connection instead of voice." into lmp-mr1-dev
...
* commit '531127a5c2293e46e16fb9bc013078506c15122e':
SIM Status now shows data connection instead of voice.
2014-12-29 13:28:18 +00:00
Prem Kumar
531127a5c2
Merge "SIM Status now shows data connection instead of voice." into lmp-mr1-dev
2014-12-29 13:23:51 +00:00
Sanket Padawe
d1724df602
am 9b1383a4: Merge "Fixed settings crash issue while recovering from phone crash." into lmp-mr1-dev
...
automerge: f128cff
2014-12-28 05:31:57 +00:00
Baligh Uddin
ac379b544f
am 8ac88edc: (-s ours) am e957cb47: (-s ours) Import translations. DO NOT MERGE
...
* commit '8ac88edc032abfb3d1105f3f2b66ef5c39d1cf8f':
Import translations. DO NOT MERGE
2014-12-24 18:57:57 +00:00
Baligh Uddin
20c1404198
am 6ccde759: (-s ours) Import translations. DO NOT MERGE
...
* commit '6ccde759cb6ca078ed47696b1cb7092e6ff96927':
Import translations. DO NOT MERGE
2014-12-24 18:57:55 +00:00
Sanket Padawe
f128cff21e
am 9b1383a4: Merge "Fixed settings crash issue while recovering from phone crash." into lmp-mr1-dev
...
* commit '9b1383a46dadd60ed89561083b01666242d457dd':
Fixed settings crash issue while recovering from phone crash.
2014-12-23 03:39:18 +00:00
Sanket Padawe
9b1383a46d
Merge "Fixed settings crash issue while recovering from phone crash." into lmp-mr1-dev
2014-12-23 03:35:23 +00:00
Sanket Padawe
79d5da7bf6
Fixed settings crash issue while recovering from phone crash.
...
Bug: 18816868
Change-Id: I2b3015f563aed2d997a3a5466ca8f0689fc53ddb
2014-12-22 10:33:49 -08:00
Baligh Uddin
8ac88edc03
am e957cb47: (-s ours) Import translations. DO NOT MERGE
...
* commit 'e957cb47a4d2bca7f5d3e8e925efae6269754cb3':
Import translations. DO NOT MERGE
2014-12-22 17:46:47 +00:00
Baligh Uddin
6ccde759cb
Import translations. DO NOT MERGE
...
Change-Id: I3f4b4d374faee184252c651295a6298c621fbcfd
Auto-generated-cl: translation import
2014-12-22 09:01:37 -08:00
Baligh Uddin
e957cb47a4
Import translations. DO NOT MERGE
...
Change-Id: I95c46e36bef66944280675891951c487f43c622f
Auto-generated-cl: translation import
2014-12-22 08:50:56 -08:00
Maurice Lam
9e1a3d6fc5
am 9ab9d1ec: Merge "[WifiSetup] Fix text colors in dark theme" into lmp-mr1-dev
...
automerge: e24c760
2014-12-20 07:48:45 +00:00
Maurice Lam
e24c760511
am 9ab9d1ec: Merge "[WifiSetup] Fix text colors in dark theme" into lmp-mr1-dev
...
* commit '9ab9d1ec82047b74a6a4fc91ab5864086e715c35':
[WifiSetup] Fix text colors in dark theme
2014-12-20 01:23:53 +00:00
Maurice Lam
9ab9d1ec82
Merge "[WifiSetup] Fix text colors in dark theme" into lmp-mr1-dev
2014-12-20 01:17:59 +00:00
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
1a5d132fcb
am 3e864c0b: Merge "Removed extraneous slot information on single SIM devices." into lmp-mr1-dev
...
* commit '3e864c0bdae3ff9801e04438b8347631b3153d6d':
Removed extraneous slot information on single SIM devices.
2014-12-19 22:57: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
Maurice Lam
b413c523c0
[WifiSetup] Fix text colors in dark theme
...
Use the attribute version of the material colors to avoid dark-on-
dark text in dark theme setup wizard.
Bug: 18810611
Change-Id: I740487e97a48016551f00c6a04876b0d4c71e0ab
2014-12-19 11:52:52 -08:00
PauloftheWest
a68bdb6dbe
Removed extraneous slot information on single SIM devices.
...
Bug: 18803333
Change-Id: If18f898839a1b7927a8db3b225549d4e4e073fdc
2014-12-18 15:02:39 -08:00
PauloftheWest
58f7eaf3d2
SIM Status now shows data connection instead of voice.
...
Bug: 18714691
Change-Id: Ia2e9642d3331126a040ae1a059300df65d9551b9
2014-12-18 13:59:04 -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
eec0c11ae3
am 19627ca2: Getting mcc/mnc from system prop instead of subInfoRecord.
...
* commit '19627ca215fa643a443722f183f3f781d4a2b041':
Getting mcc/mnc from system prop instead of subInfoRecord.
2014-12-18 18:38:52 +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
Amith Yamasani
39fb062795
Fix theme for empty activity
...
Avoids janky transition when confirmation of device credential
is requested.
Bug: 18637426
Change-Id: I3645e180e50f570d6d09d649978064fa5adf7755
2014-12-18 10:22:02 -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
72cedc7af5
am c4cc07b2: Merge "Revert "Getting mcc/mnc from system prop instead of subInfoRecord."" into lmp-mr1-dev
...
* commit 'c4cc07b2c7f91cdb3695c499f7dca17b8aa9cb6b':
Revert "Getting mcc/mnc from system prop instead of subInfoRecord."
2014-12-18 06:33:06 +00:00
Sanket Padawe
c4cc07b2c7
Merge "Revert "Getting mcc/mnc from system prop instead of subInfoRecord."" into lmp-mr1-dev
2014-12-18 06:28:09 +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
cff282f3fc
am 080674e6: Merge "Getting mcc/mnc from system prop instead of subInfoRecord." into lmp-mr1-dev
...
* commit '080674e6da8e3db392a2a9e96a00cfc8e4635d00':
Getting mcc/mnc from system prop instead of subInfoRecord.
2014-12-18 04:58:46 +00:00
Sanket Padawe
080674e6da
Merge "Getting mcc/mnc from system prop instead of subInfoRecord." into lmp-mr1-dev
2014-12-18 04:53:34 +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
Geoff Mendal
c5fdbe8271
am 3a92fb26: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
...
* commit '3a92fb2693925f804964914728f40eb94c0c2bfb':
Import translations. DO NOT MERGE
2014-12-17 14:37:24 +00:00
Geoff Mendal
3a92fb2693
Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
2014-12-17 14:33:27 +00:00
Geoff Mendal
e1ea5a5c8e
am b4ff0269: (-s ours) am 3b08bdec: (-s ours) Import translations. DO NOT MERGE
...
* commit 'b4ff026930c1578cb8d6644a40169946758b70ce':
Import translations. DO NOT MERGE
2014-12-17 14:31:17 +00:00
Geoff Mendal
181494318c
Import translations. DO NOT MERGE
...
Change-Id: I37ca51108f533323a830a9fcb550af4b94a2b2a3
Auto-generated-cl: translation import
2014-12-17 06:28:32 -08:00
Geoff Mendal
b4ff026930
am 3b08bdec: (-s ours) Import translations. DO NOT MERGE
...
* commit '3b08bdec9415a99190cf6f93837c41cea5e0c04a':
Import translations. DO NOT MERGE
2014-12-17 14:26:09 +00:00
Geoff Mendal
3b08bdec94
Import translations. DO NOT MERGE
...
Change-Id: I58cb836de181e6a7b4de701941e3a13bea7378cb
Auto-generated-cl: translation import
2014-12-17 06:18:00 -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
5aaa4b63bd
am b0c8c393: Merge "Add a periodic check of the tethering provisioning" into lmp-mr1-dev
...
* commit 'b0c8c3935d5842cfefbe96d958d537fb80d4a33e':
Add a periodic check of the tethering provisioning
2014-12-16 16:59:47 +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
996724ea6d
am 7131f1a9: Merge "Prevent sim notify popup after upgrade from k to LMR1." into lmp-mr1-dev
...
* commit '7131f1a99cd87d452a1ab915333d7b1dbdfb9114':
Prevent sim notify popup after upgrade from k to LMR1.
2014-12-16 02:49:36 +00:00
Sanket Padawe
b92f336886
am d0591276: Merge "Exiting activity on clicking outside dialog acitivity." into lmp-mr1-dev
...
* commit 'd059127659048d9f26a79e22728068c709e2d831':
Exiting activity on clicking outside dialog acitivity.
2014-12-16 02:49:35 +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
7741dff861
am 4fe583d4: Merge "Made the WPS icon visisble." into lmp-mr1-dev
...
automerge: 3df1fe0
2014-12-16 01:41:58 +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
3df1fe080f
am 4fe583d4: Merge "Made the WPS icon visisble." into lmp-mr1-dev
...
* commit '4fe583d4cf2e2f3ba86f80e8695b104234d714eb':
Made the WPS icon visisble.
2014-12-16 00:54:21 +00:00
