git.osdn.net Git - android-x86/packages-apps-Settings.git/log

(root) / android-x86 / packages-apps-Settings.git / log

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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.

commit | commitdiff | tree

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.

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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.

commit | commitdiff | tree

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.

commit | commitdiff | tree

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

commit | commitdiff | tree

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."

commit | commitdiff | tree

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."

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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.

commit | commitdiff | tree

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.

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Geoff Mendal [Wed, 17 Dec 2014 14:33:26 +0000 (14:33 +0000)]

Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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.

commit | commitdiff | tree

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.

commit | commitdiff | tree

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.

commit | commitdiff | tree

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.

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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.

commit | commitdiff | tree

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.

commit | commitdiff | tree

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.

commit | commitdiff | tree

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.

commit | commitdiff | tree

PauloftheWest [Mon, 15 Dec 2014 22:49:24 +0000 (22:49 +0000)]

Merge "Made the WPS icon visisble." into lmp-mr1-dev

commit | commitdiff | tree

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

commit | commitdiff | tree

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.

commit | commitdiff | tree

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.

commit | commitdiff | tree

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.

commit | commitdiff | tree

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.

commit | commitdiff | tree

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.

commit | commitdiff | tree

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

commit | commitdiff | tree

Wink Saville [Mon, 15 Dec 2014 20:45:00 +0000 (20:45 +0000)]

Merge "Use getLIn1NumberForSubscriber to get phone number." into lmp-mr1-dev

commit | commitdiff | tree

Wink Saville [Mon, 15 Dec 2014 20:04:29 +0000 (12:04 -0800)]

Use getLIn1NumberForSubscriber to get phone number.

Bug: 18721557
Change-Id: I255627638efe21362315286a659ac59b46e1fa30
Signed-off-by: Wink Saville <wink@google.com>

commit | commitdiff | tree

Stuart Scott [Mon, 15 Dec 2014 19:43:19 +0000 (19:43 +0000)]

Merge "Show toast when cellular data option is changing." into lmp-mr1-dev

commit | commitdiff | tree

PauloftheWest [Mon, 15 Dec 2014 19:34:31 +0000 (19:34 +0000)]

am 682b7ed3: Merge "IMEI information will show without a SIM." into lmp-mr1-dev

* commit '682b7ed34c01ea65edfe034afe52180052b9e2fc':
IMEI information will show without a SIM.

commit | commitdiff | tree

PauloftheWest [Mon, 15 Dec 2014 19:28:43 +0000 (19:28 +0000)]

Merge "IMEI information will show without a SIM." into lmp-mr1-dev

commit | commitdiff | tree

PauloftheWest [Mon, 15 Dec 2014 18:54:56 +0000 (10:54 -0800)]

Made the WPS icon visisble.

Bug: 18335660
Change-Id: I62fd0be70680f74d7898dcf806ebbe41e5eb7342

commit | commitdiff | tree

PauloftheWest [Mon, 15 Dec 2014 18:29:54 +0000 (10:29 -0800)]

IMEI information will show without a SIM.

Bug: 18701340
Change-Id: I1e92bd1af4d68849f194d30b5b894cfb144900e5

commit | commitdiff | tree

Maurice Lam [Mon, 15 Dec 2014 17:56:32 +0000 (17:56 +0000)]

am 4e8a7219: am 8e0929a3: Merge "[FRP] Open the lock setup screens in same task" into lmp-mr1-dev

* commit '4e8a7219c866030b5870c9d8e0fa930423761048':
[FRP] Open the lock setup screens in same task

commit | commitdiff | tree

Maurice Lam [Mon, 15 Dec 2014 17:49:49 +0000 (17:49 +0000)]

am 8e0929a3: Merge "[FRP] Open the lock setup screens in same task" into lmp-mr1-dev

* commit '8e0929a32ed60b95a34416a5362df93f5a329b5f':
[FRP] Open the lock setup screens in same task

commit | commitdiff | tree

Maurice Lam [Mon, 15 Dec 2014 17:44:52 +0000 (17:44 +0000)]

Merge "[FRP] Open the lock setup screens in same task" into lmp-mr1-dev

commit | commitdiff | tree

Narayan Kamath [Mon, 15 Dec 2014 16:27:39 +0000 (16:27 +0000)]

resolved conflicts for merge of fa893886 to lmp-mr1-dev-plus-aosp

Change-Id: Iaf57dd96ab10c3f03a964fed593571895ea7be3a

commit | commitdiff | tree

Geoff Mendal [Mon, 15 Dec 2014 15:08:45 +0000 (15:08 +0000)]

am d9df577d: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev

* commit 'd9df577d94828775e20f20ab1efa02d8a7a5bbac':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Geoff Mendal [Mon, 15 Dec 2014 15:04:31 +0000 (15:04 +0000)]

Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev

commit | commitdiff | tree

Geoff Mendal [Mon, 15 Dec 2014 14:43:37 +0000 (14:43 +0000)]

am d33d2127: (-s ours) am d3affe47: (-s ours) Import translations. DO NOT MERGE

* commit 'd33d2127f739083c2f23a99eecd6bc3f21b53b83':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Geoff Mendal [Mon, 15 Dec 2014 14:42:32 +0000 (06:42 -0800)]

Import translations. DO NOT MERGE

Change-Id: I1cd9781471c0c3c1c74fc429e9013e9e8dfeef41
Auto-generated-cl: translation import

commit | commitdiff | tree

Geoff Mendal [Mon, 15 Dec 2014 14:36:51 +0000 (14:36 +0000)]

am d3affe47: (-s ours) Import translations. DO NOT MERGE

* commit 'd3affe47eedcdc6aa2bfd829f55fce8ed2be7e72':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Geoff Mendal [Mon, 15 Dec 2014 14:26:44 +0000 (06:26 -0800)]

Import translations. DO NOT MERGE

Change-Id: I07a9426156ec5f40cded12af58aca05723a55005
Auto-generated-cl: translation import

commit | commitdiff | tree

Narayan Kamath [Mon, 15 Dec 2014 14:23:46 +0000 (14:23 +0000)]

Merge "Stop using apache-http in settings."

commit | commitdiff | tree

Lucky Zhang [Sat, 13 Dec 2014 00:29:43 +0000 (00:29 +0000)]

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

commit | commitdiff | tree

Lucky Zhang [Sat, 13 Dec 2014 00:24:20 +0000 (00:24 +0000)]

am 5f17119f: Merge "[FRP] Notification screen slides in wrong direction" into lmp-mr1-dev

* commit '5f17119f4683617ed5444c088b0439bb005a3514':
[FRP] Notification screen slides in wrong direction

commit | commitdiff | tree

Lucky Zhang [Sat, 13 Dec 2014 00:15:31 +0000 (00:15 +0000)]

Merge "[FRP] Notification screen slides in wrong direction" into lmp-mr1-dev

commit | commitdiff | tree

PauloftheWest [Fri, 12 Dec 2014 17:09:40 +0000 (09:09 -0800)]

Fixed then icons of SIMs in the call dialog.

Bug: 18672758
Change-Id: I812e79a48b048f8449cc07fdcccab57a114cdd24

commit | commitdiff | tree

John Spurlock [Fri, 12 Dec 2014 19:08:46 +0000 (19:08 +0000)]

am e964060b: am b4805e3a: Settings: Allow more lines of saver feature description text.

* commit 'e964060b5de4b534431b58c2ac4fae9fdd6baedc':
Settings: Allow more lines of saver feature description text.

commit | commitdiff | tree

John Spurlock [Fri, 12 Dec 2014 19:04:24 +0000 (19:04 +0000)]

am b4805e3a: Settings: Allow more lines of saver feature description text.

* commit 'b4805e3a3481196a0e945d397bef0950a843f5a3':
Settings: Allow more lines of saver feature description text.

commit | commitdiff | tree

John Spurlock [Fri, 12 Dec 2014 17:54:48 +0000 (12:54 -0500)]

Settings: Allow more lines of saver feature description text.

Bug: 18706906
Change-Id: I27bfd5e70c3e20c17fcad691cfb3c9f74d7d0390

commit | commitdiff | tree

Narayan Kamath [Fri, 12 Dec 2014 13:53:28 +0000 (13:53 +0000)]

Stop using apache-http in settings.

Most of this usage is from crufty "test" code, and is trivially
replacable.

bug: 18027885

Change-Id: If4441a5e76405eba068479a4dcaa6012b5a74cbf

commit | commitdiff | tree

Wink Saville [Fri, 12 Dec 2014 04:42:28 +0000 (04:42 +0000)]

am 8a21ab00: Merge "Change tests against INVALID_SUBSCRIPTION_ID to use isValidSubscriptionId." into lmp-mr1-dev
automerge: fc748fe

* commit 'fc748fe9da449e427887c6d2381f9bd4462de56f':
Change tests against INVALID_SUBSCRIPTION_ID to use isValidSubscriptionId.

commit | commitdiff | tree

Wink Saville [Fri, 12 Dec 2014 04:37:35 +0000 (04:37 +0000)]

am 8a21ab00: Merge "Change tests against INVALID_SUBSCRIPTION_ID to use isValidSubscriptionId." into lmp-mr1-dev

* commit '8a21ab00e5ec5141e4bd745ab9e7f161db98cb1a':
Change tests against INVALID_SUBSCRIPTION_ID to use isValidSubscriptionId.

commit | commitdiff | tree

Prem Kumar [Fri, 12 Dec 2014 04:31:59 +0000 (04:31 +0000)]

am 96ca2cfd: Merge "Clearing junk layout for add wifi dialog in settings." into lmp-mr1-dev
automerge: f41c6c4

* commit 'f41c6c4577169880a2c339ec84d93078513b3402':
Clearing junk layout for add wifi dialog in settings.

commit | commitdiff | tree

Wink Saville [Fri, 12 Dec 2014 04:23:16 +0000 (04:23 +0000)]

Merge "Change tests against INVALID_SUBSCRIPTION_ID to use isValidSubscriptionId." into lmp-mr1-dev

commit | commitdiff | tree

Maurice Lam [Fri, 12 Dec 2014 02:22:08 +0000 (18:22 -0800)]

[FRP] Open the lock setup screens in same task

Set the taskAffinity of of the lock setup screens so that the
transitions behave correctly.

Bug: 18724458
Change-Id: Ibca7adfad1e5bd07c7e7d2e1beb279c5e57ac735

commit | commitdiff | tree

Lucky Zhang [Fri, 12 Dec 2014 02:10:01 +0000 (18:10 -0800)]

[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

commit | commitdiff | tree

Prem Kumar [Fri, 12 Dec 2014 00:59:34 +0000 (00:59 +0000)]

am 96ca2cfd: Merge "Clearing junk layout for add wifi dialog in settings." into lmp-mr1-dev

* commit '96ca2cfd087078e4042f9ab9678c77dea136eefe':
Clearing junk layout for add wifi dialog in settings.

commit | commitdiff | tree

Prem Kumar [Fri, 12 Dec 2014 00:52:31 +0000 (00:52 +0000)]

Merge "Clearing junk layout for add wifi dialog in settings." into lmp-mr1-dev

commit | commitdiff | tree

Sanket Padawe [Thu, 11 Dec 2014 23:48:45 +0000 (15:48 -0800)]

Clearing junk layout for add wifi dialog in settings.

Bug: 18359901
Change-Id: I9957efd0a6740ee470ee36b09a7b6884a0d2c63a

commit | commitdiff | tree

Sanket Padawe [Thu, 11 Dec 2014 22:36:26 +0000 (14:36 -0800)]

Exiting activity on clicking outside dialog acitivity.

Bug: 18705619
Change-Id: I50cb08884f1c97352f5ad3a3e7d218b42af1ada4

commit | commitdiff | tree

Jason Monk [Wed, 10 Dec 2014 22:21:51 +0000 (17:21 -0500)]

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

commit | commitdiff | tree

Wink Saville [Thu, 11 Dec 2014 18:10:05 +0000 (10:10 -0800)]

Change tests against INVALID_SUBSCRIPTION_ID to use isValidSubscriptionId.

Bug: 18668873
Change-Id: Ie709a62bbb74e0a767daeb9e3fb3aecd4c45df44

commit | commitdiff | tree

Zoltan Szatmary-Ban [Thu, 11 Dec 2014 18:02:29 +0000 (18:02 +0000)]

Merge "Bring up correct app for Recent location list items" into lmp-mr1-dev automerge: 25a1181
automerge: d0831ae

* commit 'd0831ae2144ce9c2eae2f11be2f4ed3689df2597':
Bring up correct app for Recent location list items

commit | commitdiff | tree

PauloftheWest [Thu, 11 Dec 2014 18:02:17 +0000 (18:02 +0000)]

Merge "Disabled SIM notifications while provisioning." into lmp-mr1-dev automerge: 209c946
automerge: 13028d1

* commit '13028d1d90a995b71999ee7c00f04adabd9cb7ff':
Disabled SIM notifications while provisioning.

commit | commitdiff | tree

Zoltan Szatmary-Ban [Thu, 11 Dec 2014 15:09:56 +0000 (15:09 +0000)]

Merge "Bring up correct app for Recent location list items" into lmp-mr1-dev
automerge: 25a1181

* commit '25a1181f2a61d32481e7c66f96c2abf7aebd761e':
Bring up correct app for Recent location list items

commit | commitdiff | tree

PauloftheWest [Thu, 11 Dec 2014 15:09:31 +0000 (15:09 +0000)]

Merge "Disabled SIM notifications while provisioning." into lmp-mr1-dev
automerge: 209c946

* commit '209c9465b3251c0a5e652214e402b1a54df234f9':
Disabled SIM notifications while provisioning.

commit | commitdiff | tree

Zoltan Szatmary-Ban [Thu, 11 Dec 2014 13:23:28 +0000 (13:23 +0000)]

Merge "Bring up correct app for Recent location list items" into lmp-mr1-dev

commit | commitdiff | tree

PauloftheWest [Thu, 11 Dec 2014 13:14:06 +0000 (13:14 +0000)]

Merge "Disabled SIM notifications while provisioning." into lmp-mr1-dev

commit | commitdiff | tree

PauloftheWest [Thu, 11 Dec 2014 00:07:03 +0000 (00:07 +0000)]

am 87015c01: am ab88ad93: Merge "Fixed a Data Usage crash" into lmp-mr1-dev

* commit '87015c0166d84b86fd1067f7e4effbe898b60c7c':
Fixed a Data Usage crash

commit | commitdiff | tree

PauloftheWest [Wed, 10 Dec 2014 21:54:50 +0000 (13:54 -0800)]

Disabled SIM notifications while provisioning.

Bug: 18672853
Change-Id: I01ba2927ad013649f13b959354a6493ba057e09f

commit | commitdiff | tree

Alexandra Gherghina [Wed, 10 Dec 2014 22:23:57 +0000 (22:23 +0000)]

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

commit | commitdiff | tree

Emily Bernier [Wed, 10 Dec 2014 22:23:54 +0000 (22:23 +0000)]

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

commit | commitdiff | tree

Geoff Mendal [Wed, 10 Dec 2014 22:22:35 +0000 (22:22 +0000)]

am e73fa6af: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev

* commit 'e73fa6afcd3f2890abf5a98107ff5387a0165ebc':
Import translations. DO NOT MERGE

packages/apps/Settings

RSS Atom

About OSDN

Find Software

Develop Software

Help