OSDN Git Service
Doris Ling [Wed, 24 Aug 2016 16:15:53 +0000 (16:15 +0000)]
Merge "Log settings suggestions events only once." into nyc-mr1-dev am:
c4e5acedba am:
12a0952d49
am:
7da62c35a7
Change-Id: I0729d5c62c7c29c173d419aace20ac44a99fd55b
Doris Ling [Wed, 24 Aug 2016 16:15:51 +0000 (16:15 +0000)]
resolve merge conflicts of
f757d1e to nyc-mr1-dev-plus-aosp
am:
6dcd71756d
Change-Id: Iae1f9cbd2f8e677e82f27e69de35228a4ae35b99
Andrew Sapperstein [Wed, 24 Aug 2016 14:50:28 +0000 (10:50 -0400)]
resolve merge conflicts of
6890d53 to master
Change-Id: I61c1ed150fe311c4e07df524b5c0577f35d3bd60
Pat Tjin [Wed, 24 Aug 2016 04:48:07 +0000 (04:48 +0000)]
Merge "Remove duplicate KEY_DEVICE_MODEL string set"
Maurice Lam [Wed, 24 Aug 2016 02:09:26 +0000 (02:09 +0000)]
Remove duplicate string for fingerprint enroll am:
64ac93ba40
am:
e0c8fcf453
Change-Id: I1ea9fad83d06ec3526921f942f3476d008717ec4
Doris Ling [Wed, 24 Aug 2016 02:09:25 +0000 (02:09 +0000)]
Merge "Log settings suggestions events only once." into nyc-mr1-dev am:
c4e5acedba
am:
12a0952d49
Change-Id: Iac5b318d0bc9f929e34fac9c46dfd3b020889738
Doris Ling [Wed, 24 Aug 2016 01:59:09 +0000 (18:59 -0700)]
resolve merge conflicts of
f757d1e to nyc-mr1-dev-plus-aosp
Change-Id: I1e53b78977bb32fe34462cf46bbfe66626574e65
TreeHugger Robot [Wed, 24 Aug 2016 01:37:56 +0000 (01:37 +0000)]
Merge "Refactored Screenshot preference to be dependent on context preference."
Matthew Fritze [Wed, 17 Aug 2016 23:49:11 +0000 (16:49 -0700)]
Refactored Screenshot preference to be dependent on context preference.
Tests: Manual.
Change-Id: I2fde1a67ade4bf89bf38b4eae0ca98074cca868c
Fixes:
30681087
Maurice Lam [Tue, 23 Aug 2016 22:23:00 +0000 (22:23 +0000)]
Remove duplicate string for fingerprint enroll
am:
64ac93ba40
Change-Id: Id49d79278ad68b0b49194576467b5e0714c55c89
Doris Ling [Tue, 23 Aug 2016 22:18:00 +0000 (22:18 +0000)]
Merge "Log settings suggestions events only once." into nyc-mr1-dev
am:
c4e5acedba
Change-Id: Ice4efccbb63061053bc1b2ea75f65fcfe41555d0
Doris Ling [Tue, 23 Aug 2016 22:18:00 +0000 (22:18 +0000)]
Log settings suggestions events only once.
am:
bfbb964cb1
Change-Id: If4e3e15b56c7e5a99eb54376c519019ff44d6a34
Doris Ling [Tue, 23 Aug 2016 22:16:40 +0000 (22:16 +0000)]
Add scrollbar to Settings app. am:
124251d54e am:
13a4eeb2a9
am:
9ca6758e0b -s ours
Change-Id: Icb6cd08141983408afdf7d81c9df80f681d77d71
Doris Ling [Tue, 23 Aug 2016 22:15:52 +0000 (22:15 +0000)]
Merge "Log settings suggestions events only once." into nyc-mr1-dev
Doris Ling [Tue, 23 Aug 2016 21:46:42 +0000 (21:46 +0000)]
Add scrollbar to Settings app. am:
124251d54e
am:
13a4eeb2a9
Change-Id: Ifbb3c930d259bc65ec54ffa496c2cfcdb5bb9a63
Doris Ling [Tue, 23 Aug 2016 21:43:33 +0000 (21:43 +0000)]
Add scrollbar to Settings app.
am:
124251d54e
Change-Id: Id59772914f83860c5ff46ace71d640e17623c98d
Rubin Xu [Tue, 23 Aug 2016 21:42:51 +0000 (21:42 +0000)]
Merge "Remove duplicated call to authenticationSucceeded()" into nyc-mr1-dev am:
0948ce0cdb am:
f9665da994
am:
0085774488
Change-Id: I31354262b3f84024ff8ab237c14d157d04ab73fc
Rubin Xu [Tue, 23 Aug 2016 21:42:49 +0000 (21:42 +0000)]
Remove duplicated call to authenticationSucceeded() am:
3a437490be am:
886af76fb3
am:
7c23b6b04a
Change-Id: I15639663bf7c2dd10da1ac4d62301e1d2f71c16b
Rubin Xu [Tue, 23 Aug 2016 21:42:46 +0000 (21:42 +0000)]
Merge "Do not require MANAGE_DEVICE_ADMINS for showing admin-specifc policy transparency dialog" into nyc-mr1-dev am:
7a4ecbac12 am:
bd7e2376fc
am:
a2da83d30a
Change-Id: If2d23f1594dd3ed75aab511252393d9be493e899
Rubin Xu [Tue, 23 Aug 2016 21:42:31 +0000 (21:42 +0000)]
Do not require MANAGE_DEVICE_ADMINS for showing admin-specifc policy transparency dialog am:
da9f9a0fab am:
7425b2d677
am:
a63a05362f
Change-Id: Ie2bc5709e3610940b5f606a64ce13d1959eed653
Doris Ling [Tue, 23 Aug 2016 21:41:35 +0000 (21:41 +0000)]
Merge "Fix crash when selecting AppInfo for uninstalled app from Recents." into nyc-mr1-dev am:
6cdd5fccd8 am:
7849b2044c
am:
fa896fbf9a
Change-Id: Ia054e45ee6bcba19c040f64d39fcf79728cc268f
Doris Ling [Tue, 23 Aug 2016 21:41:34 +0000 (21:41 +0000)]
Fix crash when selecting AppInfo for uninstalled app from Recents. am:
7574b64910 am:
0f7d5f36a3
am:
753f95d7e0
Change-Id: If963000c751255858be1fa5b24067048b2802193
Doris Ling [Tue, 23 Aug 2016 21:41:33 +0000 (21:41 +0000)]
Merge "Update Jump to Camera gesture settings description text." into nyc-mr1-dev am:
e9af5024a1 am:
7c529e5ba8
am:
b29f18c49f
Change-Id: I277dee4300e66e7d7bb1d84cc122b5aedb761d1c
Doris Ling [Tue, 23 Aug 2016 21:41:32 +0000 (21:41 +0000)]
Update Jump to Camera gesture settings description text. am:
8d9b89ed5c am:
b9ed707735
am:
340d8b6268
Change-Id: I134dcdf0e2ea1aabed23788befc35b79ee2d6e9f
Doris Ling [Tue, 23 Aug 2016 21:41:31 +0000 (21:41 +0000)]
Merge "Fix caption text being cut off when text size is set to very large." into nyc-mr1-dev am:
cf988e3d64 am:
f1c69ead73
am:
317af15dec
Change-Id: I177ecdd5a00ddc03e9ba9790a6275abcc58354b6
Doris Ling [Tue, 23 Aug 2016 21:40:46 +0000 (21:40 +0000)]
Fix caption text being cut off when text size is set to very large. am:
0f625ae280 am:
3768e718c6
am:
6e5ea7dbb9
Change-Id: I6dd5baf3ba3a42abb1e6e67058d2c8884228734b
Doris Ling [Tue, 23 Aug 2016 21:40:45 +0000 (21:40 +0000)]
Merge "Fix margin in Tap & pay -> Payment default." into nyc-mr1-dev am:
15c13f9e10 am:
ea445c9db7
am:
f101f3c396
Change-Id: Icb986ac5d17c0423bdd68dd975c13c20cdcad59d
Doris Ling [Tue, 23 Aug 2016 21:40:44 +0000 (21:40 +0000)]
Fix margin in Tap & pay -> Payment default. am:
9e29ac7983 am:
88842736d7
am:
a44f2e0f8f
Change-Id: I258bf58e922ff3b866bc21e8cdc7fb5fbf6991da
Matthew Fritze [Tue, 23 Aug 2016 21:40:44 +0000 (21:40 +0000)]
Merge "Stop apps with Storage Managers from launching activity when disabled" into nyc-mr1-dev am:
88d3cb7176 am:
c9be13f26e
am:
b4522799ef
Change-Id: I6ad201c483befea0a28e3fa21ddd1b63f09dfc00
Matthew Fritze [Tue, 23 Aug 2016 21:40:43 +0000 (21:40 +0000)]
Stop apps with Storage Managers from launching activity when disabled am:
1051fe1e14 am:
7444ee791c
am:
bf61bf6459
Change-Id: I14d7a4615a479f3a9e77a5139d89cc05d474f15c
Salvador Martinez [Tue, 23 Aug 2016 21:39:53 +0000 (21:39 +0000)]
Merge "Disabled BSM mode switch when plugged in" into nyc-mr1-dev am:
4c8776627b am:
b3b0fd931b
am:
bc81965891
Change-Id: Ibe60de90217cb7be265ee5b7f41c7ffcfaf4d6ac
Salvador Martinez [Tue, 23 Aug 2016 21:39:51 +0000 (21:39 +0000)]
Disabled BSM mode switch when plugged in am:
d4a6768880 am:
18d58269a8
am:
3f3ce9595b
Change-Id: I0e703a0d249ae4708bce34733834a52ab01bfc00
Salvador Martinez [Tue, 23 Aug 2016 21:39:49 +0000 (21:39 +0000)]
Merge "Made dialog material design compliant" into nyc-mr1-dev am:
4f6755931e am:
a60628517f
am:
fd59fa60e9
Change-Id: Ia76c4984d2d0433b5f66af634f744ed030563d90
Salvador Martinez [Tue, 23 Aug 2016 21:39:46 +0000 (21:39 +0000)]
Made dialog material design compliant am:
cfee94d448 am:
676db52b64
am:
1e9b8e67ff
Change-Id: I249dc055c7e429b3fb624e2fcaba90e0e2df1ebd
Salvador Martinez [Tue, 23 Aug 2016 21:39:43 +0000 (21:39 +0000)]
Merge "Settings Focus prevented from moving to pref" into nyc-mr1-dev am:
0e98c73666 am:
5817342f14
am:
597d352cfb
Change-Id: I865e8548b4b00cbddbd3ce54db9a4ff0ce5b7442
Salvador Martinez [Tue, 23 Aug 2016 21:30:13 +0000 (21:30 +0000)]
Merge "resolve merge conflicts of
052975e to master"
TreeHugger Robot [Tue, 23 Aug 2016 21:24:41 +0000 (21:24 +0000)]
Merge "Extract and refactor logic to determine the data usage summary mark."
Salvador Martinez [Tue, 23 Aug 2016 20:59:48 +0000 (13:59 -0700)]
resolve merge conflicts of
052975e to master
Change-Id: I276079d08c2a73b2b00b065da666e33b33642fbd
Maurice Lam [Wed, 10 Aug 2016 19:27:29 +0000 (12:27 -0700)]
Remove duplicate string for fingerprint enroll
Bug:
30661068
Change-Id: Id8ba9eee04eded2c85535a577ac0f5a83034ce96
(cherry picked from commit
56093f6f4f08c4d57b40d853d1491149ed07b5c1)
Doris Ling [Tue, 2 Aug 2016 21:45:58 +0000 (14:45 -0700)]
Log settings suggestions events only once.
The show/hide settings suggestions events are logged every time Settings
is shown. Save the logged events into the state bundle so that when the
fragment is resumed, it does not re-log the suggestions events.
Also move the logging for the show suggestion event to when the suggestion
is loaded, as the suggestions can be empty when the fragment starts.
Change-Id: I644ea0012bad309e59fed0d48171915c955779cc
Fixes:
30108142
Salvador Martinez [Tue, 23 Aug 2016 20:06:53 +0000 (20:06 +0000)]
Merge "Prevent wifi icon from disappearing" into nyc-mr1-dev am:
89d138b724 am:
d31d90eecf
am:
2279920944
Change-Id: Iccb6ae0dd0b8d584fd0c1121b7bb91bcbbd235e8
Salvador Martinez [Tue, 23 Aug 2016 20:06:49 +0000 (20:06 +0000)]
Prevent wifi icon from disappearing am:
5c0063af7e am:
56ebf2a051
am:
5bbfa0555a
Change-Id: Ic365caef2c120220ae7ec13e576ae589017bc545
Matthew Fritze [Tue, 23 Aug 2016 00:40:02 +0000 (17:40 -0700)]
Extract and refactor logic to determine the data usage summary mark.
Created a new controller for DataUsageInfo and add appropriate
unit tests.
Bug:
30946416
Change-Id: Ida1281a771013fd807242f846edb4f2a9c0ccabb
Test: Robolectric tests with target RunSettingsRoboTests
TreeHugger Robot [Tue, 23 Aug 2016 18:37:45 +0000 (18:37 +0000)]
Merge "Force phone number display to be LTR in support tab."
Rubin Xu [Tue, 23 Aug 2016 18:31:19 +0000 (18:31 +0000)]
Merge "Remove duplicated call to authenticationSucceeded()" into nyc-mr1-dev am:
0948ce0cdb
am:
f9665da994
Change-Id: Ia5c441a86cfd6cc9c4c3ba0c207c4289ea5a4bb2
Rubin Xu [Tue, 23 Aug 2016 18:31:16 +0000 (18:31 +0000)]
Remove duplicated call to authenticationSucceeded() am:
3a437490be
am:
886af76fb3
Change-Id: Ic0154eef40bfe90a62644405e35092ac037db000
Rubin Xu [Tue, 23 Aug 2016 18:30:14 +0000 (18:30 +0000)]
Merge "Do not require MANAGE_DEVICE_ADMINS for showing admin-specifc policy transparency dialog" into nyc-mr1-dev am:
7a4ecbac12
am:
bd7e2376fc
Change-Id: I07dbf8982e52bf83b111988e50dd0f41b83403cb
Rubin Xu [Tue, 23 Aug 2016 18:30:10 +0000 (18:30 +0000)]
Do not require MANAGE_DEVICE_ADMINS for showing admin-specifc policy transparency dialog am:
da9f9a0fab
am:
7425b2d677
Change-Id: I69aad745936b8d53fbe9389d8ff8f7e2d3b98d66
Doris Ling [Tue, 23 Aug 2016 18:30:09 +0000 (18:30 +0000)]
Merge "Fix crash when selecting AppInfo for uninstalled app from Recents." into nyc-mr1-dev am:
6cdd5fccd8
am:
7849b2044c
Change-Id: I56adf86e478ac08dda17c3ad45ba862d50c952e7
Doris Ling [Tue, 23 Aug 2016 18:30:08 +0000 (18:30 +0000)]
Fix crash when selecting AppInfo for uninstalled app from Recents. am:
7574b64910
am:
0f7d5f36a3
Change-Id: I91f1ee6cebb8af959b0dbed6aa213fae4c8de605
Doris Ling [Tue, 23 Aug 2016 18:30:07 +0000 (18:30 +0000)]
Merge "Update Jump to Camera gesture settings description text." into nyc-mr1-dev am:
e9af5024a1
am:
7c529e5ba8
Change-Id: Ib5ce02c97c0f9f72c101c0412b232483f0893cc3
Doris Ling [Tue, 23 Aug 2016 18:29:11 +0000 (18:29 +0000)]
Update Jump to Camera gesture settings description text. am:
8d9b89ed5c
am:
b9ed707735
Change-Id: Ic4a89942d6007a1d96b1fc5c500bb3124575e7d2
Doris Ling [Tue, 23 Aug 2016 18:29:10 +0000 (18:29 +0000)]
Merge "Fix caption text being cut off when text size is set to very large." into nyc-mr1-dev am:
cf988e3d64
am:
f1c69ead73
Change-Id: Ib00c8325f8dbf5b54c8ab00b43fe42eccc89ccf0
Doris Ling [Tue, 23 Aug 2016 18:29:09 +0000 (18:29 +0000)]
Fix caption text being cut off when text size is set to very large. am:
0f625ae280
am:
3768e718c6
Change-Id: I213e38d90f0fe8c5df5f7026ed9e652401d1fd69
Doris Ling [Tue, 23 Aug 2016 18:29:08 +0000 (18:29 +0000)]
Merge "Fix margin in Tap & pay -> Payment default." into nyc-mr1-dev am:
15c13f9e10
am:
ea445c9db7
Change-Id: I7fc61672c9df0a808c0a07723346678222c4ccf3
Doris Ling [Tue, 23 Aug 2016 18:29:07 +0000 (18:29 +0000)]
Fix margin in Tap & pay -> Payment default. am:
9e29ac7983
am:
88842736d7
Change-Id: Ia933244f4d9bf6cf2700f1815a77bbfcf47468e0
Matthew Fritze [Tue, 23 Aug 2016 18:28:04 +0000 (18:28 +0000)]
Merge "Stop apps with Storage Managers from launching activity when disabled" into nyc-mr1-dev am:
88d3cb7176
am:
c9be13f26e
Change-Id: Ia249e3ea91b80d443be64c19f0a89da133a5a2c8
Matthew Fritze [Tue, 23 Aug 2016 18:27:59 +0000 (18:27 +0000)]
Stop apps with Storage Managers from launching activity when disabled am:
1051fe1e14
am:
7444ee791c
Change-Id: Ia358b60aff78a967663112399a260ffc2de27668
Salvador Martinez [Tue, 23 Aug 2016 18:27:56 +0000 (18:27 +0000)]
Merge "Disabled BSM mode switch when plugged in" into nyc-mr1-dev am:
4c8776627b
am:
b3b0fd931b
Change-Id: Ib36fed3ad37831b957bf445e1ad116dacb49baf0
Salvador Martinez [Tue, 23 Aug 2016 18:27:52 +0000 (18:27 +0000)]
Disabled BSM mode switch when plugged in am:
d4a6768880
am:
18d58269a8
Change-Id: I3001c4e21f5e1bcae64074962ab4399f0787aaa3
Salvador Martinez [Tue, 23 Aug 2016 18:27:49 +0000 (18:27 +0000)]
Merge "Made dialog material design compliant" into nyc-mr1-dev am:
4f6755931e
am:
a60628517f
Change-Id: Ie9a865fc1cc13a1b516d2b4a99eca84cc5adfeb7
Salvador Martinez [Tue, 23 Aug 2016 18:26:40 +0000 (18:26 +0000)]
Made dialog material design compliant am:
cfee94d448
am:
676db52b64
Change-Id: I2b5cdd12cda5b364afb1532e548b090144084a45
Salvador Martinez [Tue, 23 Aug 2016 18:26:39 +0000 (18:26 +0000)]
Merge "Settings Focus prevented from moving to pref" into nyc-mr1-dev am:
0e98c73666
am:
5817342f14
Change-Id: Id0d329a2a682e46a0168ed47f6fdba8e3163a6c9
Salvador Martinez [Tue, 23 Aug 2016 18:26:38 +0000 (18:26 +0000)]
Settings Focus prevented from moving to pref am:
41fc4e8cb7
am:
ce14c1e5eb
Change-Id: I56f870955b8bc534e21fec821404fe38c75a8e65
Salvador Martinez [Tue, 23 Aug 2016 18:26:37 +0000 (18:26 +0000)]
Merge "Prevent wifi icon from disappearing" into nyc-mr1-dev am:
89d138b724
am:
d31d90eecf
Change-Id: Icfc80e8e55a41cbc4039e5075cd883a5ebf6d2c8
Salvador Martinez [Tue, 23 Aug 2016 18:26:33 +0000 (18:26 +0000)]
Prevent wifi icon from disappearing am:
5c0063af7e
am:
56ebf2a051
Change-Id: I0cf475280dd390e55befd285c33cde593e8c7878
Doris Ling [Thu, 18 Aug 2016 22:16:23 +0000 (15:16 -0700)]
Add scrollbar to Settings app.
Overlay PreferenceTheme to add scrollbar to the view, and also add
scrollbar to the dashboard.
Change-Id: I2273b0825b200048bd1914923b551a593aa1e16d
Fixes:
30204662
Test: manual - Launch Settings and different sub-settings, and verify
that scrollbar is shown for screen that can be scrolled.
Rubin Xu [Tue, 23 Aug 2016 16:22:49 +0000 (16:22 +0000)]
Merge "Remove duplicated call to authenticationSucceeded()" into nyc-mr1-dev
am:
0948ce0cdb
Change-Id: I3bafba20cd5a44eb9af7de66e056dc5cc558b63e
Rubin Xu [Tue, 23 Aug 2016 16:22:49 +0000 (16:22 +0000)]
Remove duplicated call to authenticationSucceeded()
am:
3a437490be
Change-Id: I929ab9d63c5100b30bfec87ee6be0b4d1164cc81
Fan Zhang [Tue, 23 Aug 2016 16:18:13 +0000 (09:18 -0700)]
Force phone number display to be LTR in support tab.
Bug:
31030062
Change-Id: I94272c0ecbfa2f96842838c0f590b3704cd5c020
Rubin Xu [Tue, 23 Aug 2016 16:07:40 +0000 (16:07 +0000)]
Merge "Do not require MANAGE_DEVICE_ADMINS for showing admin-specifc policy transparency dialog" into nyc-mr1-dev
am:
7a4ecbac12
Change-Id: Id5ee904fbde064dba4702cdb9bae99c063d96d94
Rubin Xu [Tue, 23 Aug 2016 16:07:36 +0000 (16:07 +0000)]
Do not require MANAGE_DEVICE_ADMINS for showing admin-specifc policy transparency dialog
am:
da9f9a0fab
Change-Id: I2a45a4530fdd25f372f08315a21ca92c453bcdd9
Doris Ling [Tue, 23 Aug 2016 16:07:32 +0000 (16:07 +0000)]
Merge "Fix crash when selecting AppInfo for uninstalled app from Recents." into nyc-mr1-dev
am:
6cdd5fccd8
Change-Id: If5eba9204524418e94c71a8278e7f64d2cb9cdf4
Doris Ling [Tue, 23 Aug 2016 16:07:29 +0000 (16:07 +0000)]
Fix crash when selecting AppInfo for uninstalled app from Recents.
am:
7574b64910
Change-Id: I9ade2a06180e6464ab105c1a12c5383aa480f77a
Doris Ling [Tue, 23 Aug 2016 16:07:25 +0000 (16:07 +0000)]
Merge "Update Jump to Camera gesture settings description text." into nyc-mr1-dev
am:
e9af5024a1
Change-Id: I96a1065ccd019d71b70149e9966359523825f2f9
Doris Ling [Tue, 23 Aug 2016 16:07:23 +0000 (16:07 +0000)]
Update Jump to Camera gesture settings description text.
am:
8d9b89ed5c
Change-Id: If069afdba7a7d7d4f8ce8038dabdebd0a0ee13de
Doris Ling [Tue, 23 Aug 2016 16:07:19 +0000 (16:07 +0000)]
Merge "Fix caption text being cut off when text size is set to very large." into nyc-mr1-dev
am:
cf988e3d64
Change-Id: Ie46fff82f0630407d46fc21f8b1558acdcaea063
Doris Ling [Tue, 23 Aug 2016 16:07:17 +0000 (16:07 +0000)]
Fix caption text being cut off when text size is set to very large.
am:
0f625ae280
Change-Id: Id3e95f1c92bd0550114acab7cd136b43f6469b80
Doris Ling [Tue, 23 Aug 2016 16:07:13 +0000 (16:07 +0000)]
Merge "Fix margin in Tap & pay -> Payment default." into nyc-mr1-dev
am:
15c13f9e10
Change-Id: I814e027259acc0b084f2b8a86bfc73ecdf453331
Doris Ling [Tue, 23 Aug 2016 16:07:10 +0000 (16:07 +0000)]
Fix margin in Tap & pay -> Payment default.
am:
9e29ac7983
Change-Id: I04ffd2ec727a87096c554ae452ed58f5c2483f1e
Matthew Fritze [Tue, 23 Aug 2016 14:43:44 +0000 (14:43 +0000)]
Merge "Stop apps with Storage Managers from launching activity when disabled" into nyc-mr1-dev
am:
88d3cb7176
Change-Id: I9c081c2f701033ba9f74c73a70fd7ea50e5cd6f5
Matthew Fritze [Tue, 23 Aug 2016 14:43:44 +0000 (14:43 +0000)]
Stop apps with Storage Managers from launching activity when disabled
am:
1051fe1e14
Change-Id: Ib2ae9dcbd034c36c44addfaea0bc84ebe3f2247b
Salvador Martinez [Tue, 23 Aug 2016 14:43:43 +0000 (14:43 +0000)]
Merge "Disabled BSM mode switch when plugged in" into nyc-mr1-dev
am:
4c8776627b
Change-Id: Ifadf14eb2f4cf46da098bad92b795dc6ff0e67e1
Salvador Martinez [Tue, 23 Aug 2016 14:43:42 +0000 (14:43 +0000)]
Disabled BSM mode switch when plugged in
am:
d4a6768880
Change-Id: I9e8116dd9413090145b7ef98b37db20706471c28
Salvador Martinez [Tue, 23 Aug 2016 14:43:41 +0000 (14:43 +0000)]
Merge "Made dialog material design compliant" into nyc-mr1-dev
am:
4f6755931e
Change-Id: Ia60e7c612435c2215789a749231d2df78de411be
Salvador Martinez [Tue, 23 Aug 2016 14:43:40 +0000 (14:43 +0000)]
Made dialog material design compliant
am:
cfee94d448
Change-Id: If01b0f216ff0a8cadaa0d659b89a0c03136ce406
Salvador Martinez [Tue, 23 Aug 2016 14:43:39 +0000 (14:43 +0000)]
Merge "Settings Focus prevented from moving to pref" into nyc-mr1-dev
am:
0e98c73666
Change-Id: Iad871a4333675bde9c1c18b50f91aed6976dada8
Salvador Martinez [Tue, 23 Aug 2016 14:43:39 +0000 (14:43 +0000)]
Settings Focus prevented from moving to pref
am:
41fc4e8cb7
Change-Id: Ifc9b53a0514830e73a06311e27acbca57b476a0d
Salvador Martinez [Tue, 23 Aug 2016 14:43:37 +0000 (14:43 +0000)]
Merge "Prevent wifi icon from disappearing" into nyc-mr1-dev
am:
89d138b724
Change-Id: I2d3d0996f4fcbfa234c46d6a7c50c84ca7517c77
Salvador Martinez [Tue, 23 Aug 2016 14:43:36 +0000 (14:43 +0000)]
Prevent wifi icon from disappearing
am:
5c0063af7e
Change-Id: I1039ce10631d7f792cae36c3a171d90df11a9e33
Rubin Xu [Tue, 23 Aug 2016 13:07:02 +0000 (13:07 +0000)]
Merge "Remove duplicated call to authenticationSucceeded()" into nyc-mr1-dev
Rubin Xu [Tue, 23 Aug 2016 12:59:16 +0000 (12:59 +0000)]
Merge "Do not require MANAGE_DEVICE_ADMINS for showing admin-specifc policy transparency dialog" into nyc-mr1-dev
Salvador Martinez [Tue, 23 Aug 2016 02:08:46 +0000 (02:08 +0000)]
Merge "Tests for launch support on default feature" into nyc-mr1-dev am:
5b5cf5a2c7 am:
f4ccb09603
am:
26fd0d0b75
Change-Id: I818e179bd0c3d3a75382b668c296f41f3d179a8e
Doris Ling [Tue, 23 Aug 2016 01:51:21 +0000 (01:51 +0000)]
Merge "Fix crash when selecting AppInfo for uninstalled app from Recents." into nyc-mr1-dev
Doris Ling [Tue, 23 Aug 2016 01:37:29 +0000 (01:37 +0000)]
Merge "Update Jump to Camera gesture settings description text." into nyc-mr1-dev
Doris Ling [Tue, 23 Aug 2016 01:30:27 +0000 (01:30 +0000)]
Merge "Fix caption text being cut off when text size is set to very large." into nyc-mr1-dev
Doris Ling [Tue, 23 Aug 2016 01:29:41 +0000 (01:29 +0000)]
Merge "Fix margin in Tap & pay -> Payment default." into nyc-mr1-dev
Fan Zhang [Tue, 23 Aug 2016 00:26:34 +0000 (17:26 -0700)]
resolve merge conflicts of
111b81d to master
Change-Id: I2b7eb6dfe73a94b6acd5ef47690ee72022b1ad6d
TreeHugger Robot [Mon, 22 Aug 2016 23:05:42 +0000 (23:05 +0000)]
Merge "Force searchview to stretch entire actionbar."
Lei Yu [Mon, 22 Aug 2016 22:38:52 +0000 (22:38 +0000)]
Merge "Make number in dialog highlighted" into nyc-mr1-dev am:
2363094863 am:
ffc6372e7d
am:
2edf494de8
Change-Id: I3ab17d11b0540d6465726911c276667e19f20733
OSDN Git Service
