Salvador Martinez
6db99201aa
Merge "Shorten main settings battery string" into oc-mr1-dev
...
am: 4e963f8f91
2017-08-01 20:01:13 +00:00
TreeHugger Robot
4e963f8f91
Merge "Shorten main settings battery string" into oc-mr1-dev
2017-08-01 19:45:59 +00:00
Fan Zhang
bbd92b5748
Merge "Disable AssistGestureSetting search if not supported" into oc-mr1-dev
...
am: 7fbfda67da
2017-08-01 19:24:23 +00:00
TreeHugger Robot
7fbfda67da
Merge "Disable AssistGestureSetting search if not supported" into oc-mr1-dev
2017-08-01 19:09:31 +00:00
Android Build Merger (Role)
8c3d164113
Merge "Import translations. DO NOT MERGE am: 2f525fbdc5 -s ours am: f8c9a63ca6 -s ours" into oc-mr1-dev-plus-aosp
2017-08-01 18:18:27 +00:00
Bill Yi
6f76c3b39f
Import translations. DO NOT MERGE am: 2f525fbdc5 -s ours
...
am: f8c9a63ca6
2017-08-01 18:18:06 +00:00
Bill Yi
8c0d932862
Import translations. DO NOT MERGE am: 2f525fbdc5 -s ours
...
am: 23e79be08d
2017-08-01 18:18:03 +00:00
Bill Yi
f8c9a63ca6
Import translations. DO NOT MERGE
...
am: 2f525fbdc5
2017-08-01 18:14:02 +00:00
Bill Yi
23e79be08d
Import translations. DO NOT MERGE
...
am: 2f525fbdc5
2017-08-01 18:14:01 +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
Geoffrey Pitsch
18a5474740
Merge "AOD setting availability depends on other user settings" into oc-dr1-dev am: 6d62355313
...
am: cf83f9dd12
2017-08-01 14:23:20 +00:00
Geoffrey Pitsch
5e6449b4f8
Merge "AOD setting availability depends on other user settings" into oc-dr1-dev am: 6d62355313
...
am: 07052239fd
2017-08-01 14:16:59 +00:00
Geoffrey Pitsch
cf83f9dd12
Merge "AOD setting availability depends on other user settings" into oc-dr1-dev
...
am: 6d62355313
2017-08-01 14:08:10 +00:00
Geoffrey Pitsch
07052239fd
Merge "AOD setting availability depends on other user settings" into oc-dr1-dev
...
am: 6d62355313
2017-08-01 14:07:37 +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
Android Build Merger (Role)
c96e9fc57d
Merge "Merge "Add shadow and wrapper classes" into oc-dr1-dev am: 0782535daf am: 26e7518f76 -s ours" into oc-mr1-dev-plus-aosp
2017-08-01 02:48:04 +00:00
jackqdyulei
bc1d04ae80
Merge "Add shadow and wrapper classes" into oc-dr1-dev am: 0782535daf -s ours
...
am: 72054d6db3
2017-08-01 02:47:35 +00:00
jackqdyulei
ec1efed50f
Merge "Add shadow and wrapper classes" into oc-dr1-dev am: 0782535daf
...
am: 26e7518f76
2017-08-01 02:47:35 +00:00
jackqdyulei
26e7518f76
Merge "Add shadow and wrapper classes" into oc-dr1-dev
...
am: 0782535daf
2017-08-01 02:44:11 +00:00
jackqdyulei
72054d6db3
Merge "Add shadow and wrapper classes" into oc-dr1-dev
...
am: 0782535daf
2017-08-01 02:44:09 +00:00
Jeff Davidson
1034816211
Merge "Remove eSIM reset checkbox and always perform the reset." into oc-dr1-dev am: cd4fbd90e7
...
am: 470c87cfea
2017-08-01 02:40:48 +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
6f95de16b5
Merge "Remove eSIM reset checkbox and always perform the reset." into oc-dr1-dev am: cd4fbd90e7
...
am: cebb6a4f9c
2017-08-01 02:35:01 +00:00
Jeff Davidson
cebb6a4f9c
Merge "Remove eSIM reset checkbox and always perform the reset." into oc-dr1-dev
...
am: cd4fbd90e7
2017-08-01 02:32:04 +00:00
Jeff Davidson
470c87cfea
Merge "Remove eSIM reset checkbox and always perform the reset." into oc-dr1-dev
...
am: cd4fbd90e7
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
Fan Zhang
4d81c5a962
Merge "Update icons to match quick setting" into oc-mr1-dev
...
am: 687cdfb5ee
2017-08-01 01:23:27 +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
8c0d24cb6d
Merge "Revert "resolve merge conflicts of 9feab7a8a5 to oc-mr1-dev"" into oc-mr1-dev
...
am: 21b22f0154
2017-08-01 01:01:35 +00:00
Matthew Fritze
61c338ee9a
Merge "Fix DataUsageSummary non-indexable keys" into oc-dr1-dev am: 57992394bf -s ours
...
am: da3462e366
2017-08-01 01:01:12 +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
e79fc44426
Merge "Fix DataUsageSummary non-indexable keys" into oc-dr1-dev am: 57992394bf
...
am: 9245af8ce5
2017-08-01 00:56:47 +00:00
Matthew Fritze
fdbf4f057b
Revert "resolve merge conflicts of 9feab7a8a5 to oc-mr1-dev"
...
This reverts commit a504291eef
2017-08-01 00:51:34 +00:00
Matthew Fritze
9245af8ce5
Merge "Fix DataUsageSummary non-indexable keys" into oc-dr1-dev
...
am: 57992394bf
2017-08-01 00:45:29 +00:00
Matthew Fritze
da3462e366
Merge "Fix DataUsageSummary non-indexable keys" into oc-dr1-dev
...
am: 57992394bf
2017-08-01 00:45:29 +00:00
Fan Zhang
1f62645592
Merge "Fix search indexing for game controller "use vibrator"" into oc-mr1-dev
...
am: 5e9b138691
2017-08-01 00:41:26 +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
Matthew Fritze
44a17e6c51
resolve merge conflicts of 9feab7a8a5 to oc-mr1-dev
...
am: a504291eef
2017-08-01 00:35:20 +00:00
Matthew Fritze
7907bd215d
Merge "resolve merge conflicts of a03a707f74 to oc-mr1-dev-plus-aosp" into oc-mr1-dev-plus-aosp
2017-08-01 00:28:57 +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
57b641eee8
resolve merge conflicts of a03a707f74 to oc-mr1-dev-plus-aosp
...
Test: I solemnly swear I tested this conflict resolution.
Change-Id: Icca7a8cc2632b35c54421cb8398c8deb4e670032
2017-07-31 17:24:17 -07:00
Eric Schwarzenbach
666d70ea76
Merge "Make only the "Add Network" WifiDialog fullscreen." into oc-mr1-dev
...
am: 5e888ad7b6
2017-08-01 00:17:31 +00: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
Android Build Merger (Role)
e140bc3795
Merge "Merge "Use package from sipper if default is null" into oc-dr1-dev am: ca24d0435b am: c65e873d3e -s ours" into oc-mr1-dev-plus-aosp
2017-07-31 23:52:47 +00:00
jackqdyulei
33b0f20c21
Merge "Use package from sipper if default is null" into oc-dr1-dev am: ca24d0435b -s ours
...
am: f1dfb105cd
2017-07-31 23:52:23 +00:00
jackqdyulei
534d566f2c
Merge "Use package from sipper if default is null" into oc-dr1-dev am: ca24d0435b
...
am: c65e873d3e
2017-07-31 23:52:23 +00:00
Matthew Fritze
a03a707f74
Merge "Add INTENT_ONLY as a ResultPayload Availibility" into oc-dr1-dev
...
am: 9feab7a8a5
2017-07-31 23:50:03 +00:00
