OSDN Git Service
Zoltan Szatmary-Ban [Fri, 19 Dec 2014 15:23:16 +0000 (15:23 +0000)]
Eliminate duplicated code for creating circled user icons in Settings.
Use Utils.getUserIcon instead.
Change-Id: Id653f8c89ac041e925464c88bbc0c7c43d3ce632
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.
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
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>
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
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.
PauloftheWest [Mon, 15 Dec 2014 19:28:43 +0000 (19:28 +0000)]
Merge "IMEI information will show without a SIM." into lmp-mr1-dev
Narayan Kamath [Mon, 15 Dec 2014 19:02:26 +0000 (19:02 +0000)]
am
62d35b65: resolved conflicts for merge of
fa893886 to lmp-mr1-dev-plus-aosp
* commit '
62d35b65f236e494520d7ca480e502c79f5f4fe3':
Stop using apache-http in settings.
Geoff Mendal [Mon, 15 Dec 2014 19:02:09 +0000 (19:02 +0000)]
am
755005bd: (-s ours) am
d9df577d: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
* commit '
755005bddf4e476dda9404d0ab3ee007b7ebd554':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 15 Dec 2014 19:02:00 +0000 (19:02 +0000)]
am
43826e66: (-s ours) am
d33d2127: (-s ours) am
d3affe47: (-s ours) Import translations. DO NOT MERGE
* commit '
43826e669679b7463cf715a7003e5641f7d24e78':
Import translations. DO NOT MERGE
PauloftheWest [Mon, 15 Dec 2014 18:54:56 +0000 (10:54 -0800)]
Made the WPS icon visisble.
Bug:
18335660
Change-Id: I62fd0be70680f74d7898dcf806ebbe41e5eb7342
Lucky Zhang [Mon, 15 Dec 2014 18:46:24 +0000 (18:46 +0000)]
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
PauloftheWest [Mon, 15 Dec 2014 18:29:54 +0000 (10:29 -0800)]
IMEI information will show without a SIM.
Bug:
18701340
Change-Id: I1e92bd1af4d68849f194d30b5b894cfb144900e5
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
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
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
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
Alexandra Gherghina [Fri, 12 Dec 2014 18:04:19 +0000 (18:04 +0000)]
Make spinner icons circular
Bug:
18311493
Change-Id: I73bd3951e2613254c1db3e8c0f2f1d174e1e4b6c
Geoff Mendal [Mon, 15 Dec 2014 15:10:49 +0000 (15:10 +0000)]
Merge "Import translations. DO NOT MERGE"
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
Geoff Mendal [Mon, 15 Dec 2014 15:04:31 +0000 (15:04 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
Geoff Mendal [Mon, 15 Dec 2014 14:53:16 +0000 (06:53 -0800)]
Import translations. DO NOT MERGE
Change-Id: Id43a27b90423827306f25836b7ef619c7a35c590
Auto-generated-cl: translation import
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
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
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
Narayan Kamath [Mon, 15 Dec 2014 14:35:20 +0000 (14:35 +0000)]
Merge "Stop using apache-http in settings."
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
(cherry picked from commit
f25627c0c960cd31e069a0aed62798dd3a6416aa)
Change-Id: I62b0c4e79812ae69767d778eb9e866cbba1d50e0
Zoltan Szatmary-Ban [Mon, 15 Dec 2014 14:28:39 +0000 (14:28 +0000)]
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
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
Narayan Kamath [Mon, 15 Dec 2014 14:23:46 +0000 (14:23 +0000)]
Merge "Stop using apache-http in settings."
Zoltan Szatmary-Ban [Mon, 15 Dec 2014 11:22:23 +0000 (11:22 +0000)]
Merge "Show removed user's data usage under its correct item"
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
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
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
John Spurlock [Fri, 12 Dec 2014 20:56:40 +0000 (20:56 +0000)]
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.
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
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.
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.
Zoltan Szatmary-Ban [Fri, 12 Dec 2014 18:48:03 +0000 (18:48 +0000)]
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
OSDN Git Service
