OSDN Git Service
Baligh Uddin [Tue, 30 Dec 2014 12:14:29 +0000 (12:14 +0000)]
am
c0b5d542: (-s ours) Import translations. DO NOT MERGE automerge:
c3068f0 -s ours automerge:
9602ba3 -s ours
* commit '
c0b5d542b6f68dfcd0c90496d487986c9727da84':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 30 Dec 2014 12:14:28 +0000 (12:14 +0000)]
am
617918d6: (-s ours) Import translations. DO NOT MERGE automerge:
ad3b94f -s ours
* commit '
617918d61b3023d2f6910b4097ea1b772612372c':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 30 Dec 2014 03:15:42 +0000 (03:15 +0000)]
Import translations. DO NOT MERGE automerge:
c3068f0 -s ours
automerge:
9602ba3 -s ours
* commit '
9602ba376289d130d0e86a454a6740456cec616e':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 30 Dec 2014 03:15:29 +0000 (03:15 +0000)]
Import translations. DO NOT MERGE
automerge:
ad3b94f -s ours
* commit '
ad3b94fbdea2364b3c89e5a8409acf623675a20a':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 30 Dec 2014 00:53:43 +0000 (00:53 +0000)]
Import translations. DO NOT MERGE
automerge:
c3068f0 -s ours
* commit '
c3068f078887f3357b498a0851591c324d3c55d5':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 30 Dec 2014 00:01:35 +0000 (00:01 +0000)]
Merge "Import translations. DO NOT MERGE"
Baligh Uddin [Mon, 29 Dec 2014 23:23:00 +0000 (15:23 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ib8589ead8d33840685d974638bf09e97ca7ce66d
Auto-generated-cl: translation import
Baligh Uddin [Mon, 29 Dec 2014 23:11:40 +0000 (15:11 -0800)]
Import translations. DO NOT MERGE
Change-Id: I2a95cc3df31da8342436e918b02792d4624e5e88
Auto-generated-cl: translation import
Baligh Uddin [Mon, 29 Dec 2014 22:59:54 +0000 (14:59 -0800)]
Import translations. DO NOT MERGE
Change-Id: Iecde29c95e3c603740f4ff7875a594083bb6b40e
Auto-generated-cl: translation import
Prem Kumar [Mon, 29 Dec 2014 17:33:22 +0000 (17:33 +0000)]
am
5aebac31: am
70c4a7b1: am
531127a5: Merge "SIM Status now shows data connection instead of voice." into lmp-mr1-dev
* commit '
5aebac31e8b0eb5bf914a822782515969949d507':
SIM Status now shows data connection instead of voice.
Sanket Padawe [Mon, 29 Dec 2014 17:25:33 +0000 (17:25 +0000)]
am
d1724df6: am
9b1383a4: Merge "Fixed settings crash issue while recovering from phone crash." into lmp-mr1-dev automerge:
f128cff
* commit '
d1724df60235b33534a02dd3cc445e6b761f43e3':
Fixed settings crash issue while recovering from phone crash.
Prem Kumar [Mon, 29 Dec 2014 17:24:52 +0000 (17:24 +0000)]
am
70c4a7b1: am
531127a5: Merge "SIM Status now shows data connection instead of voice." into lmp-mr1-dev
* commit '
70c4a7b145c4949761e0f13642c535d1bf3c810e':
SIM Status now shows data connection instead of voice.
Prem Kumar [Mon, 29 Dec 2014 13:28:18 +0000 (13:28 +0000)]
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.
Prem Kumar [Mon, 29 Dec 2014 13:23:49 +0000 (13:23 +0000)]
Merge "SIM Status now shows data connection instead of voice." into lmp-mr1-dev
Sanket Padawe [Sun, 28 Dec 2014 05:31:57 +0000 (05:31 +0000)]
am
9b1383a4: Merge "Fixed settings crash issue while recovering from phone crash." into lmp-mr1-dev
automerge:
f128cff
* commit '
f128cff21ef7b8e2fa7721b481477ffecd9244ab':
Fixed settings crash issue while recovering from phone crash.
Baligh Uddin [Wed, 24 Dec 2014 19:04:59 +0000 (19:04 +0000)]
am
ac379b54: (-s ours) am
8ac88edc: (-s ours) am
e957cb47: (-s ours) Import translations. DO NOT MERGE
* commit '
ac379b544f9508cc10cbe48d9058cf65a3ad8123':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 24 Dec 2014 19:04:56 +0000 (19:04 +0000)]
am
20c14041: (-s ours) am
6ccde759: (-s ours) Import translations. DO NOT MERGE
* commit '
20c1404198aa6948aee6374b29daa292f47c1cf6':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 24 Dec 2014 18:57:57 +0000 (18:57 +0000)]
am
8ac88edc: (-s ours) am
e957cb47: (-s ours) Import translations. DO NOT MERGE
* commit '
8ac88edc032abfb3d1105f3f2b66ef5c39d1cf8f':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 24 Dec 2014 18:57:55 +0000 (18:57 +0000)]
am
6ccde759: (-s ours) Import translations. DO NOT MERGE
* commit '
6ccde759cb6ca078ed47696b1cb7092e6ff96927':
Import translations. DO NOT MERGE
Sanket Padawe [Tue, 23 Dec 2014 03:39:18 +0000 (03:39 +0000)]
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.
Sanket Padawe [Tue, 23 Dec 2014 03:35:22 +0000 (03:35 +0000)]
Merge "Fixed settings crash issue while recovering from phone crash." into lmp-mr1-dev
Sanket Padawe [Mon, 22 Dec 2014 18:33:49 +0000 (10:33 -0800)]
Fixed settings crash issue while recovering from phone crash.
Bug:
18816868
Change-Id: I2b3015f563aed2d997a3a5466ca8f0689fc53ddb
Baligh Uddin [Mon, 22 Dec 2014 17:46:47 +0000 (17:46 +0000)]
am
e957cb47: (-s ours) Import translations. DO NOT MERGE
* commit '
e957cb47a4d2bca7f5d3e8e925efae6269754cb3':
Import translations. DO NOT MERGE
Baligh Uddin [Mon, 22 Dec 2014 17:12:51 +0000 (09:12 -0800)]
Import translations. DO NOT MERGE
Change-Id: I0276ab183a6b8f4f2afef13961cd91e1e4593587
Auto-generated-cl: translation import
Baligh Uddin [Mon, 22 Dec 2014 17:01:37 +0000 (09:01 -0800)]
Import translations. DO NOT MERGE
Change-Id: I3f4b4d374faee184252c651295a6298c621fbcfd
Auto-generated-cl: translation import
Baligh Uddin [Mon, 22 Dec 2014 16:50:56 +0000 (08:50 -0800)]
Import translations. DO NOT MERGE
Change-Id: I95c46e36bef66944280675891951c487f43c622f
Auto-generated-cl: translation import
Maurice Lam [Sat, 20 Dec 2014 07:55:12 +0000 (07:55 +0000)]
am
9e1a3d6f: am
9ab9d1ec: Merge "[WifiSetup] Fix text colors in dark theme" into lmp-mr1-dev automerge:
e24c760
* commit '
9e1a3d6fc58a99cdc15024d8447744e1eaff10ba':
[WifiSetup] Fix text colors in dark theme
Maurice Lam [Sat, 20 Dec 2014 07:48:45 +0000 (07:48 +0000)]
am
9ab9d1ec: Merge "[WifiSetup] Fix text colors in dark theme" into lmp-mr1-dev
automerge:
e24c760
* commit '
e24c7605119312b0f8333c827663738fb2719e7b':
[WifiSetup] Fix text colors in dark theme
Maurice Lam [Sat, 20 Dec 2014 01:23:53 +0000 (01:23 +0000)]
am
9ab9d1ec: Merge "[WifiSetup] Fix text colors in dark theme" into lmp-mr1-dev
* commit '
9ab9d1ec82047b74a6a4fc91ab5864086e715c35':
[WifiSetup] Fix text colors in dark theme
Maurice Lam [Sat, 20 Dec 2014 01:17:58 +0000 (01:17 +0000)]
Merge "[WifiSetup] Fix text colors in dark theme" into lmp-mr1-dev
PauloftheWest [Fri, 19 Dec 2014 23:08:39 +0000 (23:08 +0000)]
am
68b93e68: am
1a5d132f: am
3e864c0b: Merge "Removed extraneous slot information on single SIM devices." into lmp-mr1-dev
* commit '
68b93e68e2cb1f3d45391da8bbc3a6d46115a28c':
Removed extraneous slot information on single SIM devices.
PauloftheWest [Fri, 19 Dec 2014 23:03:11 +0000 (23:03 +0000)]
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.
PauloftheWest [Fri, 19 Dec 2014 22:57:11 +0000 (22:57 +0000)]
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.
PauloftheWest [Fri, 19 Dec 2014 22:53:03 +0000 (22:53 +0000)]
Merge "Removed extraneous slot information on single SIM devices." into lmp-mr1-dev
Maurice Lam [Fri, 19 Dec 2014 19:52:52 +0000 (11:52 -0800)]
[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
Zoltan Szatmary-Ban [Fri, 19 Dec 2014 10:24:00 +0000 (10:24 +0000)]
Merge "Badge items in Settings > Apps > Running correctly"
Fyodor Kupolov [Fri, 19 Dec 2014 01:47:13 +0000 (01:47 +0000)]
Merge "Remove Users & profiles header for phones"
Sanket Padawe [Thu, 18 Dec 2014 23:20:44 +0000 (23:20 +0000)]
am
ec3f7998: am
eec0c11a: am
19627ca2: Getting mcc/mnc from system prop instead of subInfoRecord.
* commit '
ec3f7998dbf2d700fde9c86bc9957ee1fb6204f6':
Getting mcc/mnc from system prop instead of subInfoRecord.
Sanket Padawe [Thu, 18 Dec 2014 23:20:18 +0000 (23:20 +0000)]
am
25f2cfe9: am
72cedc7a: am
c4cc07b2: Merge "Revert "Getting mcc/mnc from system prop instead of subInfoRecord."" into lmp-mr1-dev
* commit '
25f2cfe94ecc7d05c3c1a74c2e210fffcfc137e1':
Revert "Getting mcc/mnc from system prop instead of subInfoRecord."
Sanket Padawe [Thu, 18 Dec 2014 23:20:16 +0000 (23:20 +0000)]
am
2497b44a: am
cff282f3: am
080674e6: Merge "Getting mcc/mnc from system prop instead of subInfoRecord." into lmp-mr1-dev
* commit '
2497b44ab0dac4d16145f6e0cae5708354506955':
Getting mcc/mnc from system prop instead of subInfoRecord.
PauloftheWest [Thu, 18 Dec 2014 23:02:39 +0000 (15:02 -0800)]
Removed extraneous slot information on single SIM devices.
Bug:
18803333
Change-Id: If18f898839a1b7927a8db3b225549d4e4e073fdc
PauloftheWest [Thu, 18 Dec 2014 21:59:04 +0000 (13:59 -0800)]
SIM Status now shows data connection instead of voice.
Bug:
18714691
Change-Id: Ia2e9642d3331126a040ae1a059300df65d9551b9
Sanket Padawe [Thu, 18 Dec 2014 18:43:55 +0000 (18:43 +0000)]
am
eec0c11a: am
19627ca2: Getting mcc/mnc from system prop instead of subInfoRecord.
* commit '
eec0c11ae3386284dd6797076764572efeca52c3':
Getting mcc/mnc from system prop instead of subInfoRecord.
Sanket Padawe [Thu, 18 Dec 2014 18:38:52 +0000 (18:38 +0000)]
am
19627ca2: Getting mcc/mnc from system prop instead of subInfoRecord.
* commit '
19627ca215fa643a443722f183f3f781d4a2b041':
Getting mcc/mnc from system prop instead of subInfoRecord.
Sanket Padawe [Thu, 18 Dec 2014 18:29:16 +0000 (10:29 -0800)]
Getting mcc/mnc from system prop instead of subInfoRecord.
Bug:
18781129
Change-Id: Idb4c70c9b936a947460e6c6d03bd40dc2ae4279a
Sanket Padawe [Thu, 18 Dec 2014 06:38:28 +0000 (06:38 +0000)]
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."
Sanket Padawe [Thu, 18 Dec 2014 06:33:06 +0000 (06:33 +0000)]
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."
Sanket Padawe [Thu, 18 Dec 2014 06:28:08 +0000 (06:28 +0000)]
Merge "Revert "Getting mcc/mnc from system prop instead of subInfoRecord."" into lmp-mr1-dev
Sanket Padawe [Thu, 18 Dec 2014 06:24:36 +0000 (06:24 +0000)]
Revert "Getting mcc/mnc from system prop instead of subInfoRecord."
This reverts commit
579b66f28da710b5a1e68e211f5bd54ea466ab8b.
Change-Id: I0b142b40c697992b60bca9020673a0828ec44977
Sanket Padawe [Thu, 18 Dec 2014 05:04:12 +0000 (05:04 +0000)]
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.
Sanket Padawe [Thu, 18 Dec 2014 04:58:46 +0000 (04:58 +0000)]
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.
Sanket Padawe [Thu, 18 Dec 2014 04:53:33 +0000 (04:53 +0000)]
Merge "Getting mcc/mnc from system prop instead of subInfoRecord." into lmp-mr1-dev
Sanket Padawe [Thu, 18 Dec 2014 03:31:30 +0000 (19:31 -0800)]
Getting mcc/mnc from system prop instead of subInfoRecord.
Bug:
18781129
Change-Id: Idefe2dfc26bef2bba2b5b1792bb5ac43a44aa6cc
Fyodor Kupolov [Mon, 8 Dec 2014 22:15:36 +0000 (14:15 -0800)]
Remove Users & profiles header for phones
In Settings/Users, remove "Users & profiles" header is no longer displayed
for phones. List of UserPreference is now explicitly sorted. Before, it
was relying on an overridden compareTo method in UserPreference, which
behavior was difficult to predict when instances of UserPreference were
mixed with other instances in the same group.
Bug:
17630523
Change-Id: Iba1ef863c2cd4e8ca307ae0aa0877c5cd9e0973d
Fyodor Kupolov [Wed, 17 Dec 2014 21:22:10 +0000 (21:22 +0000)]
Merge "Disable CryptKeeper activity for secondary users"
Geoff Mendal [Wed, 17 Dec 2014 14:42:24 +0000 (14:42 +0000)]
am
c5fdbe82: (-s ours) am
3a92fb26: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
* commit '
c5fdbe8271f6f34baa27521d6146fbc6e7429a58':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 17 Dec 2014 14:40:40 +0000 (14:40 +0000)]
Merge "Import translations. DO NOT MERGE"
Geoff Mendal [Wed, 17 Dec 2014 14:39:27 +0000 (06:39 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ie9e5f675f83b6e8b48302066d22578c23f96f070
Auto-generated-cl: translation import
Geoff Mendal [Wed, 17 Dec 2014 14:37:24 +0000 (14:37 +0000)]
am
3a92fb26: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
* commit '
3a92fb2693925f804964914728f40eb94c0c2bfb':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 17 Dec 2014 14:37:12 +0000 (14:37 +0000)]
am
e1ea5a5c: (-s ours) am
b4ff0269: (-s ours) am
3b08bdec: (-s ours) Import translations. DO NOT MERGE
* commit '
e1ea5a5c8e4ed8b327603958492778550059664a':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 17 Dec 2014 14:33:26 +0000 (14:33 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
Geoff Mendal [Wed, 17 Dec 2014 14:31:17 +0000 (14:31 +0000)]
am
b4ff0269: (-s ours) am
3b08bdec: (-s ours) Import translations. DO NOT MERGE
* commit '
b4ff026930c1578cb8d6644a40169946758b70ce':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 17 Dec 2014 14:28:32 +0000 (06:28 -0800)]
Import translations. DO NOT MERGE
Change-Id: I37ca51108f533323a830a9fcb550af4b94a2b2a3
Auto-generated-cl: translation import
Geoff Mendal [Wed, 17 Dec 2014 14:26:09 +0000 (14:26 +0000)]
am
3b08bdec: (-s ours) Import translations. DO NOT MERGE
* commit '
3b08bdec9415a99190cf6f93837c41cea5e0c04a':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 17 Dec 2014 14:18:00 +0000 (06:18 -0800)]
Import translations. DO NOT MERGE
Change-Id: I58cb836de181e6a7b4de701941e3a13bea7378cb
Auto-generated-cl: translation import
Alan Viverette [Wed, 17 Dec 2014 00:54:12 +0000 (00:54 +0000)]
Merge "Show a toast when filtering obscured touch input"
Alan Viverette [Wed, 17 Dec 2014 00:51:19 +0000 (16:51 -0800)]
Show a toast when filtering obscured touch input
We can't verify user consent if the touch input is obscured, so the
best we can do is fail with an informative message.
BUG:
18082299
Change-Id: I99bea51171d998c0e0ba58dd7bbf1167d4af925d
Alexandra Gherghina [Tue, 16 Dec 2014 20:46:43 +0000 (20:46 +0000)]
Merge "Make spinner icons circular"
Jason Monk [Tue, 16 Dec 2014 17:11:29 +0000 (17:11 +0000)]
am
c0ecaeef: am
5aaa4b63: am
b0c8c393: Merge "Add a periodic check of the tethering provisioning" into lmp-mr1-dev
* commit '
c0ecaeefe8d22c8dbd77c51090cb55e1c448b983':
Add a periodic check of the tethering provisioning
Jason Monk [Tue, 16 Dec 2014 17:05:14 +0000 (17:05 +0000)]
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
Jason Monk [Tue, 16 Dec 2014 16:59:47 +0000 (16:59 +0000)]
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
Jason Monk [Tue, 16 Dec 2014 15:44:25 +0000 (15:44 +0000)]
Merge "Add a periodic check of the tethering provisioning" into lmp-mr1-dev
Sanket Padawe [Tue, 16 Dec 2014 11:02:49 +0000 (11:02 +0000)]
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.
Sanket Padawe [Tue, 16 Dec 2014 11:02:45 +0000 (11:02 +0000)]
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.
Sanket Padawe [Tue, 16 Dec 2014 03:00:41 +0000 (03:00 +0000)]
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.
Sanket Padawe [Tue, 16 Dec 2014 03:00:39 +0000 (03:00 +0000)]
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.
Sanket Padawe [Tue, 16 Dec 2014 02:49:36 +0000 (02:49 +0000)]
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.
Sanket Padawe [Tue, 16 Dec 2014 02:49:35 +0000 (02:49 +0000)]
am
d0591276: Merge "Exiting activity on clicking outside dialog acitivity." into lmp-mr1-dev
* commit '
d059127659048d9f26a79e22728068c709e2d831':
Exiting activity on clicking outside dialog acitivity.
Fyodor Kupolov [Tue, 9 Dec 2014 00:13:11 +0000 (16:13 -0800)]
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
Sanket Padawe [Tue, 16 Dec 2014 02:42:28 +0000 (02:42 +0000)]
Merge "Prevent sim notify popup after upgrade from k to LMR1." into lmp-mr1-dev
Sanket Padawe [Tue, 16 Dec 2014 02:42:16 +0000 (02:42 +0000)]
Merge "Exiting activity on clicking outside dialog acitivity." into lmp-mr1-dev
PauloftheWest [Tue, 16 Dec 2014 01:48:21 +0000 (01:48 +0000)]
am
7741dff8: am
4fe583d4: Merge "Made the WPS icon visisble." into lmp-mr1-dev automerge:
3df1fe0
* commit '
7741dff861d341d427025a5147b9fadc4f3484b9':
Made the WPS icon visisble.
PauloftheWest [Tue, 16 Dec 2014 01:48:19 +0000 (01:48 +0000)]
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.
PauloftheWest [Tue, 16 Dec 2014 01:41:58 +0000 (01:41 +0000)]
am
4fe583d4: Merge "Made the WPS icon visisble." into lmp-mr1-dev
automerge:
3df1fe0
* commit '
3df1fe080f27ef46f1f3b03125391f0166af8664':
Made the WPS icon visisble.
PauloftheWest [Tue, 16 Dec 2014 01:41:48 +0000 (01:41 +0000)]
am
c6f5c924: Merge "Fixed then icons of SIMs in the call dialog." into lmp-mr1-dev
automerge:
735e93e
* commit '
735e93e52c59e13a27f24170c5e41ca22d5e4e6a':
Fixed then icons of SIMs in the call dialog.
PauloftheWest [Tue, 16 Dec 2014 00:54:21 +0000 (00:54 +0000)]
am
4fe583d4: Merge "Made the WPS icon visisble." into lmp-mr1-dev
* commit '
4fe583d4cf2e2f3ba86f80e8695b104234d714eb':
Made the WPS icon visisble.
PauloftheWest [Tue, 16 Dec 2014 00:54:20 +0000 (00:54 +0000)]
am
c6f5c924: Merge "Fixed then icons of SIMs in the call dialog." into lmp-mr1-dev
* commit '
c6f5c924d8a796da1a3c2e6bd5e44c755a532771':
Fixed then icons of SIMs in the call dialog.
PauloftheWest [Mon, 15 Dec 2014 22:49:24 +0000 (22:49 +0000)]
Merge "Made the WPS icon visisble." into lmp-mr1-dev
Wink Saville [Mon, 15 Dec 2014 22:47:01 +0000 (22:47 +0000)]
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.
Stuart Scott [Mon, 15 Dec 2014 22:47:00 +0000 (22:47 +0000)]
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.
PauloftheWest [Mon, 15 Dec 2014 22:46:57 +0000 (22:46 +0000)]
Merge "Fixed then icons of SIMs in the call dialog." into lmp-mr1-dev
Wink Saville [Mon, 15 Dec 2014 22:41:53 +0000 (22:41 +0000)]
am
870a2a8e: am
e04fd76f: Merge "Use getLIn1NumberForSubscriber to get phone number." into lmp-mr1-dev
* commit '
870a2a8ea85670dafdcd9d8617e0c99862f0604d':
Use getLIn1NumberForSubscriber to get phone number.
Stuart Scott [Mon, 15 Dec 2014 22:41:52 +0000 (22:41 +0000)]
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.
Wink Saville [Mon, 15 Dec 2014 22:35:58 +0000 (22:35 +0000)]
am
e04fd76f: Merge "Use getLIn1NumberForSubscriber to get phone number." into lmp-mr1-dev
* commit '
e04fd76f1c1a345a47673d460a04372670bad6c0':
Use getLIn1NumberForSubscriber to get phone number.
Stuart Scott [Mon, 15 Dec 2014 22:35:57 +0000 (22:35 +0000)]
am
b62bfe71: Merge "Show toast when cellular data option is changing." into lmp-mr1-dev
* commit '
b62bfe715552fb86330958755f0e12ab0ffe7cad':
Show toast when cellular data option is changing.
PauloftheWest [Mon, 15 Dec 2014 22:22:19 +0000 (22:22 +0000)]
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.
Maurice Lam [Mon, 15 Dec 2014 22:03:39 +0000 (22:03 +0000)]
am
befc1267: am
4e8a7219: am
8e0929a3: Merge "[FRP] Open the lock setup screens in same task" into lmp-mr1-dev
* commit '
befc1267a59b4b412b86babedaa4f6727fa239a0':
[FRP] Open the lock setup screens in same task
PauloftheWest [Mon, 15 Dec 2014 21:45:37 +0000 (21:45 +0000)]
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.
Sanket Padawe [Mon, 15 Dec 2014 20:06:17 +0000 (12:06 -0800)]
Prevent sim notify popup after upgrade from k to LMR1.
Bug:
18705619
Change-Id: I6de4d20172c69358c1853e6a00c68fc353c7dad7
Wink Saville [Mon, 15 Dec 2014 20:45:00 +0000 (20:45 +0000)]
Merge "Use getLIn1NumberForSubscriber to get phone number." into lmp-mr1-dev
OSDN Git Service
