Fan Zhang
dadfd50325
Misc change to support loading dynamic summary/icon in app
...
- Add ThreadUtils.postOnBackground helper method
- Don't fallback to app.icon if tile's metadata contains icon uri
- Deprecate TITLE_RES_ID in favor of TITLE metadata
Bug: 63758074
Test: robotests
Change-Id: Ie60fb4677cdb12c3ff313ffdfdb4a4f4960fac0f
2017-08-02 21:38:49 +00:00
TreeHugger Robot
a404b8ad84
Merge "Docs: Note that DISALLOW_CONFIG_VPN stops VPNs from starting"
2017-07-24 17:38:47 +00:00
Fyodor Kupolov
5fd324476e
Merge "Improve NewDatabasePerformanceTests"
2017-07-24 15:55:55 +00:00
Michael Wright
078fa4344c
Merge "Merge "Use new, lower brightness value for low brightness doze." into oc-dr1-dev am: f5c3922645 am: 59965d6d7f" into oc-mr1-dev-plus-aosp
...
am: 693411c903
Change-Id: I1e22f79a440410b047e2aa4d8580642b643cbbd0
2017-07-24 15:44:04 +00:00
Michael Wright
360e2721cb
Merge "Use new, lower brightness value for low brightness doze." into oc-dr1-dev am: f5c3922645 am: fd743c3352
...
am: 6039c8b592
Change-Id: I00e6483f9356238e57ad9b9992c41972411aec28
2017-07-24 15:42:18 +00:00
Android Build Merger (Role)
693411c903
Merge "Merge "Use new, lower brightness value for low brightness doze." into oc-dr1-dev am: f5c3922645 am: 59965d6d7f" into oc-mr1-dev-plus-aosp
2017-07-24 15:34:36 +00:00
Michael Wright
6039c8b592
Merge "Use new, lower brightness value for low brightness doze." into oc-dr1-dev am: f5c3922645
...
am: fd743c3352
Change-Id: Ic63ed0679d80732724da4b970f8497a2edcc966a
2017-07-24 15:33:19 +00:00
Michael Wright
37e6d76ce0
Merge "Use new, lower brightness value for low brightness doze." into oc-dr1-dev am: f5c3922645
...
am: 59965d6d7f
Change-Id: I1fe823880b3fd958237173f80663f88c8690406c
2017-07-24 15:33:18 +00:00
Michael Wright
59965d6d7f
Merge "Use new, lower brightness value for low brightness doze." into oc-dr1-dev
...
am: f5c3922645
Change-Id: Icffd015c285e10255c2404fb9eeefaa6c63b230c
2017-07-24 15:24:22 +00:00
Michael Wright
fd743c3352
Merge "Use new, lower brightness value for low brightness doze." into oc-dr1-dev
...
am: f5c3922645
Change-Id: I72aaf6f03537cf9997ad46ecb3cf5dc1f2b483bf
2017-07-24 15:24:17 +00:00
TreeHugger Robot
f5c3922645
Merge "Use new, lower brightness value for low brightness doze." into oc-dr1-dev
2017-07-24 15:16:24 +00:00
Christine Franks
2d31491d57
Merge "Merge "Remove reference to com.android.retaildemo" into oc-dr1-dev am: 173e721ab6 am: 867df9f1b9" into oc-mr1-dev-plus-aosp
...
am: 60bddcf2f0
Change-Id: I6df4f66ec867cd8e294d3b1d4003a9846e11bf4a
2017-07-24 15:08:03 +00:00
Christine Franks
f8eda938e7
Merge "Remove reference to com.android.retaildemo" into oc-dr1-dev am: 173e721ab6 am: 6de76e53b4
...
am: 29a9778684
Change-Id: I9451656888c659d58ac7315f552e7ecaa07d8615
2017-07-24 15:06:14 +00:00
Android Build Merger (Role)
60bddcf2f0
Merge "Merge "Remove reference to com.android.retaildemo" into oc-dr1-dev am: 173e721ab6 am: 867df9f1b9" into oc-mr1-dev-plus-aosp
2017-07-24 14:58:51 +00:00
Christine Franks
bd68d7baf4
Merge "Remove reference to com.android.retaildemo" into oc-dr1-dev am: 173e721ab6
...
am: 867df9f1b9
Change-Id: I2cbf1ae4352f531359a82d8d2ee811b760d090c7
2017-07-24 14:57:19 +00:00
Christine Franks
29a9778684
Merge "Remove reference to com.android.retaildemo" into oc-dr1-dev am: 173e721ab6
...
am: 6de76e53b4
Change-Id: Ib814b3121958cf8429e1b65f3f7f669c145bdd35
2017-07-24 14:57:14 +00:00
Christine Franks
6de76e53b4
Merge "Remove reference to com.android.retaildemo" into oc-dr1-dev
...
am: 173e721ab6
Change-Id: I0b9ee1a61d98f882f2cfda21cea4c30220cdd427
2017-07-24 14:47:17 +00:00
Christine Franks
867df9f1b9
Merge "Remove reference to com.android.retaildemo" into oc-dr1-dev
...
am: 173e721ab6
Change-Id: I9937a58fffdbeefd9a6aace84dd977c2fe22aa09
2017-07-24 14:47:05 +00:00
Jorim Jaggi
a4ec0b0f1f
Merge "Revert "Fix jank when switching themes" am: 6498f96283 am: 7f58322d51" into oc-mr1-dev-plus-aosp
...
am: 541e655c44
Change-Id: Ib4b218b511abaa2937d5d451ee0174137c4895c0
2017-07-24 14:35:38 +00:00
Christine Franks
173e721ab6
Merge "Remove reference to com.android.retaildemo" into oc-dr1-dev
2017-07-24 14:33:46 +00:00
Jorim Jaggi
b52ae1ad52
Revert "Fix jank when switching themes" am: 6498f96283 am: 51a1525199
...
am: e5e7ea281f
Change-Id: If4e1ae37e07d92a59592dc943aebc6a6940b4f31
2017-07-24 14:32:22 +00:00
Android Build Merger (Role)
541e655c44
Merge "Revert "Fix jank when switching themes" am: 6498f96283 am: 7f58322d51" into oc-mr1-dev-plus-aosp
2017-07-24 14:26:52 +00:00
Jorim Jaggi
aa2ecb4de3
Revert "Fix jank when switching themes" am: 6498f96283
...
am: 7f58322d51
Change-Id: Ide35fd3cf01a26168e4b208bcec39b0251e608f8
2017-07-24 14:25:08 +00:00
Jorim Jaggi
e5e7ea281f
Revert "Fix jank when switching themes" am: 6498f96283
...
am: 51a1525199
Change-Id: I06187734d198eff410f1b04d2c7c2e491e57e709
2017-07-24 14:23:10 +00:00
Jorim Jaggi
7f58322d51
Revert "Fix jank when switching themes"
...
am: 6498f96283
Change-Id: Ie5813f1c04a6db9d5ee291df764873900add5064
2017-07-24 14:14:34 +00:00
Jorim Jaggi
51a1525199
Revert "Fix jank when switching themes"
...
am: 6498f96283
Change-Id: I7e833b282939153d63fc2ffbeb8d5cb77923b62d
2017-07-24 14:14:27 +00:00
Jorim Jaggi
6498f96283
Revert "Fix jank when switching themes"
...
This reverts commit e5d0b9dddbcd8e6be7725a89b82fb990db2dade7.
Fixes crashloop with lock pattern
Change-Id: I3721444c91e2be625c59ec3e6ba14f1080badc07
Fixes: 63980375
2017-07-24 15:53:42 +02:00
Michael Wright
9c6f4bfba7
Merge "Merge "Remove non-safe mode boot vibration." into oc-dr1-dev am: 149ff697ff am: 63b79f2340" into oc-mr1-dev-plus-aosp
...
am: 7bc33e2655
Change-Id: I6759050f2008c77b59cb68d765e7b99982b17076
2017-07-24 13:14:51 +00:00
Michael Wright
87fd229db3
Merge "Remove non-safe mode boot vibration." into oc-dr1-dev am: 149ff697ff am: d487520e4c
...
am: 0d0eb6ba09
Change-Id: I2b7192326573d05aa61295ff82545415a51238bc
2017-07-24 13:11:32 +00:00
Android Build Merger (Role)
7bc33e2655
Merge "Merge "Remove non-safe mode boot vibration." into oc-dr1-dev am: 149ff697ff am: 63b79f2340" into oc-mr1-dev-plus-aosp
2017-07-24 13:03:21 +00:00
Michael Wright
51c0ffab44
Merge "Remove non-safe mode boot vibration." into oc-dr1-dev am: 149ff697ff
...
am: 63b79f2340
Change-Id: Ib88d664ecdecee9ae75f9c430aa3e3006e192e1a
2017-07-24 13:01:35 +00:00
Michael Wright
0d0eb6ba09
Merge "Remove non-safe mode boot vibration." into oc-dr1-dev am: 149ff697ff
...
am: d487520e4c
Change-Id: I5769c233212c941e3f1356b01695680a44d2986a
2017-07-24 13:01:33 +00:00
Michael Wright
d487520e4c
Merge "Remove non-safe mode boot vibration." into oc-dr1-dev
...
am: 149ff697ff
Change-Id: Ie8964116ffb3dccd6b683f0fff764d128107ac4f
2017-07-24 12:52:43 +00:00
Michael Wright
63b79f2340
Merge "Remove non-safe mode boot vibration." into oc-dr1-dev
...
am: 149ff697ff
Change-Id: I8339730c21619c4249826a5b855657c01757147c
2017-07-24 12:52:38 +00:00
TreeHugger Robot
149ff697ff
Merge "Remove non-safe mode boot vibration." into oc-dr1-dev
2017-07-24 12:46:25 +00:00
Hugo Benichi
d1de178e75
Merge "CaptivePortalLoginActivity: improve logging" am: c0a4f5357e am: d5174ac63d am: d394285fdc am: d1a0599537
...
am: a631781c48
Change-Id: I05e774c27eec657afdafe68f869ee47611924de4
2017-07-24 12:10:16 +00:00
Hugo Benichi
a631781c48
Merge "CaptivePortalLoginActivity: improve logging" am: c0a4f5357e am: d5174ac63d am: d394285fdc
...
am: d1a0599537
Change-Id: I8090a26efa655ac9c753a0826ed2f053a5d7d27e
2017-07-24 12:01:17 +00:00
Hugo Benichi
d1a0599537
Merge "CaptivePortalLoginActivity: improve logging" am: c0a4f5357e am: d5174ac63d
...
am: d394285fdc
Change-Id: I68cced9b81569a6338d0e55062691d87288e8aff
2017-07-24 11:52:45 +00:00
Hugo Benichi
d394285fdc
Merge "CaptivePortalLoginActivity: improve logging" am: c0a4f5357e
...
am: d5174ac63d
Change-Id: Ia8a9105404399901ca633a8f883ffa5be8f9548b
2017-07-24 11:43:12 +00:00
Hugo Benichi
d5174ac63d
Merge "CaptivePortalLoginActivity: improve logging"
...
am: c0a4f5357e
Change-Id: I475b58f1a6146f0faf4ddf90f44e032ee6c3120f
2017-07-24 11:34:40 +00:00
Treehugger Robot
c0a4f5357e
Merge "CaptivePortalLoginActivity: improve logging"
2017-07-24 11:21:21 +00:00
Benjamin Miller
1f83e4d498
Docs: Note that DISALLOW_CONFIG_VPN stops VPNs from starting
...
VPNs don't start except a DPC's configured always-on VPN. Clarified version behaviors.
Staged at: go/dac-stage/reference/android/os/UserManager.html#DISALLOW_CONFIG_VPN
Test: make ds-docs and output staged UserManager page
Bug: 63582789
Change-Id: I83c0c6cc580b9d1d224a94e073f559f23cf4d672
2017-07-24 12:59:42 +02:00
Selim Cinek
430c8c07c0
Merge "Removing contents hidden string for public notifications" into oc-dr1-dev am: 8650c7c0f1 am: 3a82a4a0f2
...
am: 6900a54562
Change-Id: I5a84244ea8b70c57bf0a74b03d125f42994f5b5b
2017-07-23 13:13:25 +00:00
Selim Cinek
c7dbc7993e
Merge "Removing contents hidden string for public notifications" into oc-dr1-dev am: 8650c7c0f1 am: 001956c626
...
am: 137123bdef
Change-Id: I8ecd74701db7e935cf20fb853e60d49594caf510
2017-07-23 13:11:23 +00:00
Selim Cinek
6900a54562
Merge "Removing contents hidden string for public notifications" into oc-dr1-dev am: 8650c7c0f1
...
am: 3a82a4a0f2
Change-Id: I2616a3ca94f30bac471f7d99b4503ac9bb8c577f
2017-07-23 13:07:22 +00:00
Selim Cinek
137123bdef
Merge "Removing contents hidden string for public notifications" into oc-dr1-dev am: 8650c7c0f1
...
am: 001956c626
Change-Id: Ic1c65063fce8cea01b01569cba6181f4465cd88e
2017-07-23 13:04:49 +00:00
Selim Cinek
001956c626
Merge "Removing contents hidden string for public notifications" into oc-dr1-dev
...
am: 8650c7c0f1
Change-Id: I4dd8cfab340c595181f52659d552bc03f51818ec
2017-07-23 12:57:20 +00:00
Selim Cinek
3a82a4a0f2
Merge "Removing contents hidden string for public notifications" into oc-dr1-dev
...
am: 8650c7c0f1
Change-Id: I10d7ab191f47bf167a5be5e0d11d7698aae58cd1
2017-07-23 12:57:19 +00:00
TreeHugger Robot
8650c7c0f1
Merge "Removing contents hidden string for public notifications" into oc-dr1-dev
2017-07-23 12:51:43 +00:00
Bill Yi
68ff051e5d
Merge "Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 51e35963ae -s ours am: 85de7f20ab -s ours" into oc-mr1-dev-plus-aosp
...
am: e6eba20c15 -s ours
Change-Id: I459f59c35e70c0bbbb00a6a12c14204afc5af499
2017-07-22 17:28:22 +00:00
