Commit Graph

38636 Commits

Author SHA1 Message Date
Ajay Nadathur
1908c4010b Merge "Fingerprint added graphic is bigger than enrolling progressbar" into oc-mr1-dev 2017-08-03 16:45:10 +00:00
Kenny Guy
27ea052133 Update work briefcase asset.
Bug: 36497538
Test: manual

Change-Id: If8c7385f75c1ff5b9fc257991e1c3255a70c8f8b
(cherry picked from commit bb504346c7)
2017-08-03 09:48:28 +00:00
Amit Mahajan
3d8d9808dd Merge "Change to not cache user entered apn type as user may change it." into oc-dr1-dev
am: d1c3bb1341

Change-Id: If5018f14c636f6634e70771471ee6ee2103a0ede
2017-08-03 01:57:38 +00:00
TreeHugger Robot
d1c3bb1341 Merge "Change to not cache user entered apn type as user may change it." into oc-dr1-dev 2017-08-03 01:46:21 +00:00
Bill Yi
f366a8716a Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am: a3bdce963f  -s ours

Change-Id: I832d9850508a376fc4dccc53df3a943379ada6cf
2017-08-02 22:07:22 +00:00
TreeHugger Robot
a3bdce963f Merge "Import translations. DO NOT MERGE" into oc-dr1-dev 2017-08-02 21:57:36 +00:00
Fan Zhang
cb9f8a8ebc Style action bar during onResume instead of onCreate
am: e156d9a59f  -s ours

Change-Id: I4b6c8332a9a950fc9b5ca2310a4099e7cf887202
2017-08-02 20:59:50 +00:00
Ajay Nadathur
c13273687a Fingerprint added graphic is bigger than enrolling progressbar
bug: 63714762
Test: Manually tested
Change-Id: I415ab41bb985eb52146693091d61152b51ecfd6c
2017-08-02 20:32:03 +00:00
Bill Yi
2533ebcc83 Import translations. DO NOT MERGE
Change-Id: Ie91a9117688052ec898ebf955a9c6978e1304af6
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
2017-08-02 12:47:11 -07:00
Fan Zhang
e156d9a59f Style action bar during onResume instead of onCreate
Change-Id: I628266e7062e514d2044c9e32668db23094d82e6
Merged-In: Ib57bf128b644737b5a34238ec85ca6d740543c5f
Fix: 64284689
Bug: 64297479
Test: robotests
2017-08-02 11:34:35 -07:00
Fan Zhang
50eb81f114 Style action bar during onResume instead of onCreate
Change-Id: Ib57bf128b644737b5a34238ec85ca6d740543c5f
Fix: 64284689
Bug: 64297479
Test: robotests
2017-08-02 17:58:47 +00:00
Amit Mahajan
9eac2f7cbc Change to not cache user entered apn type as user may change it.
Test: manual
Bug: 64263412
Change-Id: Idc49109926e123eddec7f6553f3c493b1ed22212
2017-08-02 09:59:03 -07:00
Bill Yi
446c5b08b1 Merge "Import translations. DO NOT MERGE" into oc-mr1-dev 2017-08-02 14:57:50 +00:00
Andrew Sapperstein
0f13525842 Merge "Refactoring DoubleTwistPreferenceController." into oc-dr1-dev
am: 3daceaec5f

Change-Id: Iabce075585a4cca4c0876999f6b9e9f031fe2c10
2017-08-02 06:07:23 +00:00
TreeHugger Robot
3daceaec5f Merge "Refactoring DoubleTwistPreferenceController." into oc-dr1-dev 2017-08-02 06:02:29 +00:00
Bill Yi
34d85d4cef Import translations. DO NOT MERGE
Change-Id: Iee79f4aad0c81901bc3c79b8dac1c95c29db3f00
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
2017-08-01 18:01:46 -07:00
Daniel Nishi
ea39f74a42 Merge "Make nfc toggability logic static and public." into oc-dr1-dev
am: b27d65fa55

Change-Id: Id09171357fb772cc05ec668eafa10e5320cefeb5
2017-08-01 23:18:58 +00:00
Daniel Nishi
b27d65fa55 Merge "Make nfc toggability logic static and public." into oc-dr1-dev 2017-08-01 23:11:18 +00:00
TreeHugger Robot
4f368a3acc Merge "Import translations. DO NOT MERGE" into oc-mr1-dev 2017-08-01 21:00:25 +00:00
Andrew Sapperstein
9c9549bd29 Refactoring DoubleTwistPreferenceController.
Made the availability and setting logic static so that
it can be invoked without creating a controller.

Bug: 62022517
Test: robotests
Change-Id: I3a51c61849e6ba8b8aa850ca22d666a9f84d252f
2017-08-01 13:56:51 -07:00
Meng Wang
1ae2573bb5 Merge "Rephrase emergency_address_summary to remove '911'" into oc-mr1-dev 2017-08-01 20:37:37 +00:00
Bill Yi
6444b2ac85 Import translations. DO NOT MERGE
am: b9fa3d1115  -s ours

Change-Id: I5efc1ca9ac51a4840d12fe21ba4db578dd00927e
2017-08-01 20:35:41 +00:00
TreeHugger Robot
4e963f8f91 Merge "Shorten main settings battery string" into oc-mr1-dev 2017-08-01 19:45:59 +00:00
TreeHugger Robot
7fbfda67da Merge "Disable AssistGestureSetting search if not supported" into oc-mr1-dev 2017-08-01 19:09:31 +00:00
Bill Yi
0607783046 Import translations. DO NOT MERGE
Change-Id: I2583b083c748943ce33715d13cf2f1c5cb9591dc
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
2017-08-01 11:31:16 -07:00
Bill Yi
b9fa3d1115 Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import

Bug: 64073208
Change-Id: Idb323f93239f5c66ae4fb53f37bff242d5839198
2017-08-01 11:15:13 -07:00
Bill Yi
f8c9a63ca6 Import translations. DO NOT MERGE
am: 2f525fbdc5  -s ours

Change-Id: Ie4d8ae83b68daefb3f38ee59fa961f8c127e3227
2017-08-01 18:14:02 +00:00
Bill Yi
2f525fbdc5 Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import

Bug: 64073208
Change-Id: I9ff6c2aa7d4a499617610046f74bb60b9f58a399
2017-08-01 11:03:31 -07:00
Salvador Martinez
dcb96058ef Shorten main settings battery string
This string will be too long in other languages so we're shortening
it for the main settings screen.

Test: robotests updated
Bug: 64124535
Change-Id: I5ccad99b1023f84ee72a144e07b1ea60f3fc01d5
2017-08-01 10:29:44 -07:00
Meng Wang
36b430e1fa Rephrase emergency_address_summary to remove '911'
Because it's not easy to translate 911 per country.

Fixes: 64226955
Test: manual
Change-Id: Ibe052090f8d33a1f3f49150fb9c0c1cc2ffb947f
2017-08-01 09:36:34 -07:00
Geoffrey Pitsch
cf83f9dd12 Merge "AOD setting availability depends on other user settings" into oc-dr1-dev
am: 6d62355313

Change-Id: If6f49df149ebaf960f40336556e5e9c199c23ef2
2017-08-01 14:08:10 +00:00
Geoffrey Pitsch
6d62355313 Merge "AOD setting availability depends on other user settings" into oc-dr1-dev 2017-08-01 14:00:18 +00:00
jackqdyulei
72054d6db3 Merge "Add shadow and wrapper classes" into oc-dr1-dev
am: 0782535daf  -s ours

Change-Id: Ic4e422d73f822b6f0a11ad624bd67e79ac1b9d73
2017-08-01 02:44:09 +00:00
TreeHugger Robot
0782535daf Merge "Add shadow and wrapper classes" into oc-dr1-dev 2017-08-01 02:37:37 +00:00
Jeff Davidson
470c87cfea Merge "Remove eSIM reset checkbox and always perform the reset." into oc-dr1-dev
am: cd4fbd90e7

Change-Id: Id37f4182ed523bbf263d6eb6c1517bbbfabf0ca4
2017-08-01 02:32:04 +00:00
TreeHugger Robot
cd4fbd90e7 Merge "Remove eSIM reset checkbox and always perform the reset." into oc-dr1-dev 2017-08-01 02:25:02 +00:00
TreeHugger Robot
687cdfb5ee Merge "Update icons to match quick setting" into oc-mr1-dev 2017-08-01 01:14:35 +00:00
Matthew Fritze
21b22f0154 Merge "Revert "resolve merge conflicts of 9feab7a8a5 to oc-mr1-dev"" into oc-mr1-dev 2017-08-01 00:59:44 +00:00
Matthew Fritze
fdbf4f057b Revert "resolve merge conflicts of 9feab7a8a5 to oc-mr1-dev"
This reverts commit a504291eef.

Reason for revert: <Build breaking>

Change-Id: I5da4f902d2fbcaffa44761b3f6ed8820ddb927bf
2017-08-01 00:51:34 +00:00
Matthew Fritze
da3462e366 Merge "Fix DataUsageSummary non-indexable keys" into oc-dr1-dev
am: 57992394bf  -s ours

Change-Id: I0e4e476dc7fb83b962ba2511ccc68a0c54d54a33
2017-08-01 00:45:29 +00:00
TreeHugger Robot
5e9b138691 Merge "Fix search indexing for game controller "use vibrator"" into oc-mr1-dev 2017-08-01 00:38:45 +00:00
TreeHugger Robot
57992394bf Merge "Fix DataUsageSummary non-indexable keys" into oc-dr1-dev 2017-08-01 00:37:26 +00:00
jackqdyulei
d6084baa89 Add shadow and wrapper classes
These classes are used for accessibility service. Also
add a new Availablity type.

Bug: 62022517
Test: Build
Change-Id: Ia2ff72dd04fd99b17809822907746c2411cecb62
Merged-In: Ia2ff72dd04fd99b17809822907746c2411cecb62
2017-07-31 17:25:54 -07:00
Matthew Fritze
a504291eef resolve merge conflicts of 9feab7a8a5 to oc-mr1-dev
Test: I solemnly swear I tested this conflict resolution.
Change-Id: I382d6f881cbfebb7692cbe49a14d9a7cc04d824e
2017-07-31 17:10:24 -07:00
TreeHugger Robot
5e888ad7b6 Merge "Make only the "Add Network" WifiDialog fullscreen." into oc-mr1-dev 2017-08-01 00:02:38 +00:00
jackqdyulei
f1dfb105cd Merge "Use package from sipper if default is null" into oc-dr1-dev
am: ca24d0435b  -s ours

Change-Id: I438dc044a0f923a288d2dea795c85ae48147bd8e
2017-07-31 23:49:11 +00:00
TreeHugger Robot
9feab7a8a5 Merge "Add INTENT_ONLY as a ResultPayload Availibility" into oc-dr1-dev 2017-07-31 23:48:02 +00:00
TreeHugger Robot
1b2408433a Merge "Add shadow and wrapper classes" into oc-mr1-dev 2017-07-31 23:44:43 +00:00
TreeHugger Robot
ca24d0435b Merge "Use package from sipper if default is null" into oc-dr1-dev 2017-07-31 23:42:49 +00:00
TreeHugger Robot
2972b5c992 Merge "Fix DataUsageSummary non-indexable keys" into oc-mr1-dev 2017-07-31 23:35:29 +00:00