OSDN Git Service
TreeHugger Robot [Mon, 16 Apr 2018 21:43:58 +0000 (21:43 +0000)]
Merge "Use OS package name when identity cleared." into pi-dev
TreeHugger Robot [Mon, 16 Apr 2018 21:22:55 +0000 (21:22 +0000)]
Merge "Allow left-right swiping from edges in QS." into pi-dev
TreeHugger Robot [Mon, 16 Apr 2018 21:19:15 +0000 (21:19 +0000)]
Merge "Always show or hide volume dialog" into pi-dev
Jiuyu Sun [Mon, 16 Apr 2018 20:48:52 +0000 (20:48 +0000)]
Merge "Fix typos." into pi-dev
Bill Yi [Mon, 16 Apr 2018 20:47:20 +0000 (13:47 -0700)]
Merge changes from topic "am-
281eb700-c15a-44d3-a49f-
153f9323e62a" into oc-dev am:
231719b4d2 am:
60fb81edda
am:
f84cc88320
Change-Id: I6cd93c965df3aa652a1b669df2a88acd3a6c4e24
Bill Yi [Mon, 16 Apr 2018 20:42:12 +0000 (13:42 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
c425155ab8 skipped:
b230479553 am:
fde5e09eeb -s ours am:
490f12c8c1 -s ours
am:
0af21ab046 -s ours
Change-Id: If9dff24f3fff2a9916d74874e2bc682b5a037c8d
Bill Yi [Mon, 16 Apr 2018 20:27:02 +0000 (13:27 -0700)]
[automerger skipped] [automerger] Import translations. DO NOT MERGE am:
ba2da34cdf skipped:
9812374054 am:
bfcb8b99a5 -s ours am:
f62419973f -s ours
am:
d9352518aa -s ours
Change-Id: Idc313d4c705d68edb65c057dfc5eb6e8e9efa80e
Bill Yi [Mon, 16 Apr 2018 20:24:55 +0000 (13:24 -0700)]
[automerger skipped] [automerger] Import translations. DO NOT MERGE am:
aaf2bd3c6d skipped:
8383370425 am:
cb80417eab -s ours am:
3194fdd40a -s ours
am:
923f65751a -s ours
Change-Id: I8b64a8fbbbcd92a6a949bcae98b44f37c0a4e09c
Bill Yi [Mon, 16 Apr 2018 20:23:17 +0000 (13:23 -0700)]
[automerger skipped] [automerger] Import translations. DO NOT MERGE am:
c7fe3a5972 skipped:
9a64c59288 am:
67841fe1e6 -s ours am:
97ddc81da4 -s ours
am:
3b3379f16a -s ours
Change-Id: I24f1dae0a8fc333cd2668f1085a81c1755a37707
Bill Yi [Mon, 16 Apr 2018 20:21:23 +0000 (13:21 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
9b8bceedc2 skipped:
1789ac6b28 am:
d12aff917a -s ours am:
06e9f9dad5 -s ours
am:
06ce4b2618 -s ours
Change-Id: I21bade1db7ee51f5ccbdd4afd08f3399c2e886e7
Philip P. Moltmann [Mon, 16 Apr 2018 20:19:04 +0000 (13:19 -0700)]
Merge changes from topic "ClearGrantIfGroupChanged-nyc" into oc-dev am:
6173fbe12e am:
6a845fe056
am:
1d9e95553b
Change-Id: Icb9e0c7261da6147d7d70be9f243fb387799c58f
Philip P. Moltmann [Mon, 16 Apr 2018 19:50:03 +0000 (12:50 -0700)]
[automerger skipped] [automerger] DO NOT MERGE (M) Revoke permision when group changed am:
d87a1a7d53 am:
5630564178 am:
90cb8f7b6e skipped:
275e6bf1b4 am:
1bbc69d8f5 am:
8dbf706e9f am:
874fe98a8f am:
9b71a72cb0 skipped:
f1776f0805 am:
877a845005 am:
885bcab242
am:
c201aff50a -s ours
Change-Id: Ie8b5e0cabb3abfa917653993f1010b3c5db7e5af
Ryan Mitchell [Mon, 16 Apr 2018 19:28:43 +0000 (19:28 +0000)]
Merge "Revert "AAPT: Modified StringPool uniqueness detection"" into pi-dev
Caxton Chan [Mon, 16 Apr 2018 19:24:31 +0000 (19:24 +0000)]
Merge "Enable feature flag for audio output switcher." into pi-dev
Bill Yi [Mon, 16 Apr 2018 19:20:42 +0000 (12:20 -0700)]
Merge changes from topic "am-
281eb700-c15a-44d3-a49f-
153f9323e62a" into oc-dev am:
231719b4d2
am:
60fb81edda
Change-Id: I5933e96aa34fc6aff073513bdb0400fd02796e62
Bill Yi [Mon, 16 Apr 2018 19:16:09 +0000 (12:16 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
c425155ab8 skipped:
b230479553 am:
fde5e09eeb -s ours
am:
490f12c8c1 -s ours
Change-Id: I5c1579d596c4f444ebee20cf217c3e4872182d0c
Bill Yi [Mon, 16 Apr 2018 19:14:27 +0000 (12:14 -0700)]
[automerger skipped] [automerger] Import translations. DO NOT MERGE am:
ba2da34cdf skipped:
9812374054 am:
bfcb8b99a5 -s ours
am:
f62419973f -s ours
Change-Id: I37dbec1d64219b2c2b57da0535364606b527f3f3
Bill Yi [Mon, 16 Apr 2018 19:01:52 +0000 (12:01 -0700)]
Merge changes from topic "am-
281eb700-c15a-44d3-a49f-
153f9323e62a" into oc-dev
am:
231719b4d2
Change-Id: I5186692869d8849e0abc8d60f97970ce07e273aa
Bill Yi [Mon, 16 Apr 2018 19:00:03 +0000 (12:00 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
c425155ab8 skipped:
b230479553
am:
fde5e09eeb -s ours
Change-Id: Ife2f1cabaad48b2b89dfe46c6de4f1cfa18c27cc
Bill Yi [Mon, 16 Apr 2018 18:58:54 +0000 (11:58 -0700)]
[automerger skipped] [automerger] Import translations. DO NOT MERGE am:
aaf2bd3c6d skipped:
8383370425 am:
cb80417eab -s ours
am:
3194fdd40a -s ours
Change-Id: I67f37180a53bdd87975f458ce68ae75890ebec29
Bill Yi [Mon, 16 Apr 2018 18:56:07 +0000 (11:56 -0700)]
[automerger skipped] [automerger] Import translations. DO NOT MERGE am:
ba2da34cdf skipped:
9812374054
am:
bfcb8b99a5 -s ours
Change-Id: I9573bb5fb938d29fbd40c94bb36203607bacdfee
Bill Yi [Mon, 16 Apr 2018 18:55:52 +0000 (11:55 -0700)]
[automerger skipped] [automerger] Import translations. DO NOT MERGE am:
c7fe3a5972 skipped:
9a64c59288 am:
67841fe1e6 -s ours
am:
97ddc81da4 -s ours
Change-Id: I0a2be41354fd01b370c95f0f77d67c878bb84d55
Philip P. Moltmann [Mon, 16 Apr 2018 18:55:42 +0000 (11:55 -0700)]
[automerger skipped] Merge "DO NOT MERGE (O) Revoke permision when group changed" into oc-dev am:
cda08919cf am:
d139755de8
am:
5e2a5a8ce1 -s ours
Change-Id: I665c1f65a60926a70627db83da5c2c6f3e4f09c8
Bill Yi [Mon, 16 Apr 2018 18:52:51 +0000 (11:52 -0700)]
[automerger skipped] [automerger] Import translations. DO NOT MERGE am:
aaf2bd3c6d skipped:
8383370425
am:
cb80417eab -s ours
Change-Id: I29e67171958497655f4d0374b2decbc1429135f7
Bill Yi [Mon, 16 Apr 2018 18:49:23 +0000 (11:49 -0700)]
[automerger skipped] [automerger] Import translations. DO NOT MERGE am:
c7fe3a5972 skipped:
9a64c59288
am:
67841fe1e6 -s ours
Change-Id: Ic7684c0d86e85aaebfb4e459d4dbd57d0d67d3b9
Bill Yi [Mon, 16 Apr 2018 18:43:55 +0000 (18:43 +0000)]
Merge changes from topic "am-
281eb700-c15a-44d3-a49f-
153f9323e62a" into oc-dev
* changes:
[automerger skipped] Import translations. DO NOT MERGE skipped:
c425155ab8 skipped:
b230479553
[automerger skipped] Import translations. DO NOT MERGE skipped:
c425155ab8
Import translations. DO NOT MERGE
Android Build Merger (Role) [Mon, 16 Apr 2018 18:42:53 +0000 (18:42 +0000)]
[automerger] Import translations. DO NOT MERGE am:
ba2da34cdf skipped:
9812374054
Change-Id: I7cb9fde2607bd5cf254218df7922c552f200d425
Android Build Merger (Role) [Mon, 16 Apr 2018 18:42:48 +0000 (18:42 +0000)]
[automerger] Import translations. DO NOT MERGE am:
ba2da34cdf
Change-Id: Ic48e117b51a8f0d3c2f9a45536b4f85f9100b43e
Android Build Merger (Role) [Mon, 16 Apr 2018 18:39:14 +0000 (18:39 +0000)]
[automerger] Import translations. DO NOT MERGE am:
aaf2bd3c6d skipped:
8383370425
Change-Id: Id86be4edea769f62ae4dd3de5a21a6fe8471151d
Android Build Merger (Role) [Mon, 16 Apr 2018 18:39:09 +0000 (18:39 +0000)]
[automerger] Import translations. DO NOT MERGE am:
aaf2bd3c6d
Change-Id: I1a5a8473bb77a315ce84e2656e5640488ecb7881
TreeHugger Robot [Mon, 16 Apr 2018 18:34:37 +0000 (18:34 +0000)]
Merge "Add new function to get audio state" into pi-dev
Android Build Merger (Role) [Mon, 16 Apr 2018 18:33:00 +0000 (18:33 +0000)]
[automerger] Import translations. DO NOT MERGE am:
c7fe3a5972 skipped:
9a64c59288
Change-Id: Iaf447a22df4ace00079a63066b0dcadce145443b
Android Build Merger (Role) [Mon, 16 Apr 2018 18:32:54 +0000 (18:32 +0000)]
[automerger] Import translations. DO NOT MERGE am:
c7fe3a5972
Change-Id: I9ec7fb1d5c5657b8b4936303d39fbecff498eb46
Ryan Mitchell [Mon, 16 Apr 2018 18:21:14 +0000 (18:21 +0000)]
Revert "AAPT: Modified StringPool uniqueness detection"
This reverts commit
35ecb89a8aa68f24d2e991df5bb9964ad15075dc.
Reason for revert: <Long make duration (infinite loop)>
Change-Id: I10d1cf53ca3054d40e23b06368ebaff6af69beab
Ricky Wai [Mon, 16 Apr 2018 18:19:00 +0000 (18:19 +0000)]
Merge "Update PackageManager.getInstalledPackages() docs" into pi-dev
TreeHugger Robot [Mon, 16 Apr 2018 17:38:34 +0000 (17:38 +0000)]
Merge "Add logging to ScheduleConditionProvider" into pi-dev
Android Build Merger (Role) [Mon, 16 Apr 2018 17:38:05 +0000 (17:38 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
c425155ab8 skipped:
b230479553
Change-Id: Ia7cd12b4e564df81716a199c23e0566a7d263e32
Bryce Lee [Mon, 16 Apr 2018 17:36:45 +0000 (17:36 +0000)]
Merge "Remove temporary logging." into pi-dev
Amin Shaikh [Mon, 16 Apr 2018 16:14:35 +0000 (12:14 -0400)]
Allow left-right swiping from edges in QS.
Apply notification side margins to all children in QSPanel except for
the tile layout. Update TileLayout to respect padding.
Change-Id: Ic6f8f2859d3a130fd4640ae915c9614240fd1c19
Fixes:
78108576
Test: visual
Ryan Mitchell [Mon, 16 Apr 2018 17:15:53 +0000 (17:15 +0000)]
Merge "AAPT: Modified StringPool uniqueness detection" into pi-dev
TreeHugger Robot [Mon, 16 Apr 2018 17:05:45 +0000 (17:05 +0000)]
Merge "Unpin bitmaps but don't purge all scratch resources." into pi-dev
Julia Reynolds [Mon, 16 Apr 2018 17:01:49 +0000 (13:01 -0400)]
Always show or hide volume dialog
Test: manual
Change-Id: Iaed56922c64cd150fdd29f1c7169cef5480a48e7
Fixes:
73666639
Fixes:
77515223
Isha Bobra [Thu, 5 Apr 2018 20:27:47 +0000 (13:27 -0700)]
The file CachedBluetoothDeviceManager.java performs synchronization
at class level. This CL just adds the missing synchronization bits.
Test: Manual
Change-Id: I71e0a194f8d126c2898a4086d6bcb62156cab9ad
Bug:
77849851
Jeff Sharkey [Mon, 16 Apr 2018 16:54:32 +0000 (16:54 +0000)]
Merge "Revert "Revert "OP_GET_USAGE_STATS should be noted, not checked.""" into pi-dev
TreeHugger Robot [Mon, 16 Apr 2018 16:50:48 +0000 (16:50 +0000)]
Merge "Revert "ViewRoot: Ensure we release surface from setWindowStopped."" into pi-dev
Jeff Sharkey [Mon, 16 Apr 2018 16:50:34 +0000 (16:50 +0000)]
Revert "Revert "OP_GET_USAGE_STATS should be noted, not checked.""
This reverts commit
bd2a9a2915c17cbe2100d6d2077568d0936cd719.
Reason for revert: ijpedowitz@
Bug:
77662908
Change-Id: I596d330d64942105f447bb613012bb11e281a805
Exempt-From-Owner-Approval: keep tests passing
Jeff Sharkey [Mon, 16 Apr 2018 16:50:06 +0000 (16:50 +0000)]
Merge "Revert "OP_GET_USAGE_STATS should be noted, not checked."" into pi-dev
Isha Bobra [Mon, 16 Apr 2018 16:42:33 +0000 (16:42 +0000)]
Merge "Show only 1 entry for hearing aid device after killing the activity." into pi-dev
Jeff Sharkey [Mon, 16 Apr 2018 16:39:55 +0000 (16:39 +0000)]
Revert "OP_GET_USAGE_STATS should be noted, not checked."
This reverts commit
5a8bcd90315c24e2f16176fd13922b2a92752cd5.
Reason for revert: ijpedowitz@
Bug:
77662908
Change-Id: I5dd0ad5038df90ea8a80ba6f583ee46fb24600c2
Exempt-From-Owner-Approval: keep tests passing
TreeHugger Robot [Mon, 16 Apr 2018 16:18:34 +0000 (16:18 +0000)]
Merge "Convert the BrightnessController to a log scale control." into pi-dev
TreeHugger Robot [Mon, 16 Apr 2018 16:08:18 +0000 (16:08 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev
TreeHugger Robot [Mon, 16 Apr 2018 16:07:27 +0000 (16:07 +0000)]
Merge changes I478047cc,Ibe16ffd7 into pi-dev
* changes:
DisplayCutout: Ensure stable insets cover top cutout
Cutout: Use stable density for inflating simulated cutouts
Jeff Sharkey [Mon, 16 Apr 2018 15:57:29 +0000 (09:57 -0600)]
Use OS package name when identity cleared.
If we pass through the original calling package name, it obviously
won't match UID 1000.
Bug:
78104140
Test: builds, boots
Change-Id: Id0acf0b038e25a113674fa2f43ff93ba05144c1f
Makoto Onuki [Mon, 16 Apr 2018 15:55:36 +0000 (15:55 +0000)]
Merge "Skip cross-user/profile check for start activity pending intents." into pi-dev
Beverly [Mon, 16 Apr 2018 15:42:40 +0000 (11:42 -0400)]
Add logging to ScheduleConditionProvider
Test: n/a
Bug:
77906756
Change-Id: Icfc0cbaf6d53315e437ac3ea3ab693b3e0703d2f
Chavi Weingarten [Mon, 16 Apr 2018 15:34:45 +0000 (15:34 +0000)]
Revert "ViewRoot: Ensure we release surface from setWindowStopped."
This reverts commit
35274cb0ce90ce4381e534d1c04c9d919eb588fc.
Reason for revert: b/
78110749
Fixes:
78110749
Change-Id: Ib1b15e4f7325cb265574090b658514fc0b3c4021
Makoto Onuki [Mon, 16 Apr 2018 15:32:20 +0000 (15:32 +0000)]
Merge "Fix "auto battery saver notification comes back"" into pi-dev
TreeHugger Robot [Mon, 16 Apr 2018 15:20:04 +0000 (15:20 +0000)]
Merge "Cutout: Fix broken cutout rendering in landscape" into pi-dev
David Brazdil [Mon, 16 Apr 2018 15:04:07 +0000 (15:04 +0000)]
Merge "Add more hidden API on light greylist" into pi-dev
Adrian Roos [Mon, 16 Apr 2018 14:56:07 +0000 (16:56 +0200)]
DisplayCutout: Ensure stable insets cover top cutout
Fixes an issue where the stable insets could become smaller
than the top cutout if the display density was set lower
than the natural density.
Bug:
78110564
Test: Set display size to "small", turn on cutout, verify apps do not have a gap between status bar and content.
Change-Id: I478047ccaade0e4e265cc57d03b072ae578b49d0
TreeHugger Robot [Mon, 16 Apr 2018 14:48:38 +0000 (14:48 +0000)]
Merge "Added screen brightness override feedback." into pi-dev
TreeHugger Robot [Mon, 16 Apr 2018 14:48:19 +0000 (14:48 +0000)]
Merge "Doc change: removed reference to the reverted Password Blacklist feature." into pi-dev
TreeHugger Robot [Mon, 16 Apr 2018 14:26:28 +0000 (14:26 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev
TreeHugger Robot [Mon, 16 Apr 2018 14:22:12 +0000 (14:22 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev
Adrian Roos [Mon, 16 Apr 2018 14:12:40 +0000 (16:12 +0200)]
Cutout: Use stable density for inflating simulated cutouts
Change-Id: Ibe16ffd792040e753d54d7085ba74e8880de111e
Fixes:
77961334
Test: Set density to Very large, enable simulated cutout, verify it still looks reasonable.
Adrian Roos [Mon, 16 Apr 2018 14:03:04 +0000 (16:03 +0200)]
Cutout: Fix broken cutout rendering in landscape
Change-Id: I835fd7fa06dfcc0eff0323efe8f2913b9e1239b8
Fixes:
77960411
Test: Simulate cutout, rotate to landscape, verify cutout is still visible.
Michael Wright [Fri, 13 Apr 2018 17:15:27 +0000 (18:15 +0100)]
Convert the BrightnessController to a log scale control.
Currently, the BrightnessController's UI is a linear scale control on
top of a linear backlight control, but humans perceive brightness on a
roughly logarithmic scale. By moving to a non-linear control, we both
give users more fine-grained control over the brightness of the display
as well as a UI that works more intuitively.
Test: manual
Bug:
73810208
Change-Id: I67090ad7c4ced0420314458473c9124cb9c61906
Benjamin Miller [Mon, 16 Apr 2018 12:54:43 +0000 (12:54 +0000)]
Doc change: removed reference to the reverted Password Blacklist feature.
Bug:
73750934
Test: make ds-docs and inspected HTML output.
Change-Id: I545ef13219dc994a4f157cc6f2380eac59331498
TreeHugger Robot [Mon, 16 Apr 2018 11:30:37 +0000 (11:30 +0000)]
Merge "Bouncer visibility fixes" into pi-dev
David Brazdil [Mon, 16 Apr 2018 11:05:41 +0000 (12:05 +0100)]
Add more hidden API on light greylist
Bug:
64382372
Bug:
78019806
Bug:
77982395
Bug:
77862070
Bug:
77860747
Bug:
77785209
Bug:
77814672
Bug:
77760092
Test: make
Change-Id: I78643c355801241a2e02f16f986a7a5d14d79823
Lucas Dupin [Mon, 16 Apr 2018 06:50:20 +0000 (14:50 +0800)]
Bouncer visibility fixes
Test: go/sysui-bouncer-tests
Change-Id: Iaf6e0ded57eb3b737cfd074bbc750aa6977e36b2
Fixes:
77921840
Bill Yi [Mon, 16 Apr 2018 08:19:56 +0000 (01:19 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I458b91bd87cd73ec887a9581ed1d4d2527513bd4
TreeHugger Robot [Mon, 16 Apr 2018 05:40:17 +0000 (05:40 +0000)]
Merge "Guard the SSID with NETWORK_SETTINGS" into pi-dev
Bill Yi [Mon, 16 Apr 2018 04:48:28 +0000 (21:48 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I06dbe1dfd8098c454295925a57df4e1ac7a41d7e
TreeHugger Robot [Mon, 16 Apr 2018 04:42:35 +0000 (04:42 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev
Chalard Jean [Mon, 16 Apr 2018 03:25:22 +0000 (12:25 +0900)]
Guard the SSID with NETWORK_SETTINGS
Bug:
77865258
Test: manual
Change-Id: I01d4ec7366382d42847c823ae6056222a012c504
Bill Yi [Mon, 16 Apr 2018 04:29:07 +0000 (21:29 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I61e1929cbf38843fcce516c103cd51e4e03ae10c
Bill Yi [Mon, 16 Apr 2018 00:08:34 +0000 (17:08 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
9b8bceedc2 skipped:
1789ac6b28 am:
d12aff917a -s ours
am:
06e9f9dad5 -s ours
Change-Id: I87341fd783f4e18607921d0023c0a8d9bb2cdaf6
Bill Yi [Mon, 16 Apr 2018 00:03:09 +0000 (17:03 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
9b8bceedc2 skipped:
1789ac6b28
am:
d12aff917a -s ours
Change-Id: I7400a1e8da6fde612c5b130228b28cf25ce5b99c
Bill Yi [Sun, 15 Apr 2018 14:16:58 +0000 (07:16 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I5dc789af62825582ca94133ab6721152b2b6871f
hughchen [Sat, 31 Mar 2018 09:32:53 +0000 (17:32 +0800)]
Add new function to get audio state
* Add getAudioState()
* Add isA2dpDevice() and isHfpDevice() in CachedBluetoothDevice
Bug:
74134939
Test: make RunSettingsLibRoboTests -j40
Change-Id: I18f4c1fcad0325a57de379f5ffe5b1135a00d084
TreeHugger Robot [Sun, 15 Apr 2018 02:55:53 +0000 (02:55 +0000)]
Merge "Respect light nav bar flag set by IME on keyguard" into pi-dev
Philip P. Moltmann [Sun, 15 Apr 2018 00:36:23 +0000 (17:36 -0700)]
Merge changes from topic "ClearGrantIfGroupChanged-nyc" into oc-dev am:
6173fbe12e
am:
6a845fe056
Change-Id: I5aebe2f67ad5f0f748db1b45c2b4ad6a1c4df530
Philip P. Moltmann [Sun, 15 Apr 2018 00:26:51 +0000 (17:26 -0700)]
Merge changes from topic "ClearGrantIfGroupChanged-nyc" into oc-dev
am:
6173fbe12e
Change-Id: I9f8435dbdee7c532c68542e5a1de75e97dfc6dea
Philip P. Moltmann [Sun, 15 Apr 2018 00:25:40 +0000 (17:25 -0700)]
[automerger] DO NOT MERGE (M) Revoke permision when group changed am:
d87a1a7d53 am:
5630564178 am:
90cb8f7b6e skipped:
275e6bf1b4 am:
1bbc69d8f5 am:
8dbf706e9f am:
874fe98a8f am:
9b71a72cb0 skipped:
f1776f0805 am:
877a845005
am:
885bcab242
Change-Id: Iec02fbfef86e421f0c7b6efc8dd49184bc39a6be
Philip P. Moltmann [Sun, 15 Apr 2018 00:14:53 +0000 (17:14 -0700)]
[automerger] DO NOT MERGE (M) Revoke permision when group changed am:
d87a1a7d53 am:
5630564178 am:
90cb8f7b6e skipped:
275e6bf1b4 am:
1bbc69d8f5 am:
8dbf706e9f am:
874fe98a8f am:
9b71a72cb0 skipped:
f1776f0805
am:
877a845005
Change-Id: Ifd815fa2dcabe164a7445654ac9f2374c7a7db9e
Philip P. Moltmann [Sat, 14 Apr 2018 23:37:25 +0000 (16:37 -0700)]
Merge "DO NOT MERGE (O) Revoke permision when group changed" into oc-dev am:
cda08919cf
am:
d139755de8
Change-Id: I3607d28823ced42c14d39d99bbfd8ea346cfc835
Philip P. Moltmann [Sat, 14 Apr 2018 23:28:15 +0000 (16:28 -0700)]
Merge "DO NOT MERGE (O) Revoke permision when group changed" into oc-dev
am:
cda08919cf
Change-Id: I949f16944d202078a1f191a1284f1c48a46cbb58
TreeHugger Robot [Sat, 14 Apr 2018 23:12:48 +0000 (23:12 +0000)]
Merge "Add new category key for ConnectDeviceFrag" into pi-dev
Android Build Merger (Role) [Sat, 14 Apr 2018 23:05:14 +0000 (23:05 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
9b8bceedc2 skipped:
1789ac6b28
Change-Id: I07cc5ff54cd477b8ea8ff6a448f7bd3622a9eb8d
Android Build Merger (Role) [Sat, 14 Apr 2018 23:05:09 +0000 (23:05 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
9b8bceedc2
Change-Id: Iaceae5c38f84ffe2ec85ea9b7219da86a857487c
Bill Yi [Sat, 14 Apr 2018 23:04:25 +0000 (16:04 -0700)]
Import translations. DO NOT MERGE
Change-Id: I81ee67e251052ffde639e2cef623bce67b81d4f2
Auto-generated-cl: translation import
Philip P. Moltmann [Sat, 14 Apr 2018 22:48:31 +0000 (15:48 -0700)]
[automerger skipped] Merge "DO NOT MERGE (O) Revoke permision when group changed" into oc-mr1-dev
am:
4cfd9bb78d -s ours
Change-Id: I2b84b8b8cf53a5a1aef7e5a7169c3c6bd42e3ecc
Android Build Merger (Role) [Sat, 14 Apr 2018 22:07:15 +0000 (22:07 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
c425155ab8
Change-Id: Id2549c7e1686f34666745e21392e1a7260887d69
Bill Yi [Sat, 14 Apr 2018 22:06:42 +0000 (15:06 -0700)]
Import translations. DO NOT MERGE
Change-Id: I325626393f7c9aaa848bec773997db66ad99cfbb
Auto-generated-cl: translation import
Bill Yi [Sat, 14 Apr 2018 21:59:57 +0000 (14:59 -0700)]
Import translations. DO NOT MERGE
Change-Id: Idbd724355ebbab64d4f4a8948607c0fd5e492ef1
Auto-generated-cl: translation import
Bill Yi [Sat, 14 Apr 2018 21:35:24 +0000 (14:35 -0700)]
Import translations. DO NOT MERGE
Change-Id: I959e7781b8d82fcce095a81698f1f4a9a0fddbc4
Auto-generated-cl: translation import
Bill Yi [Sat, 14 Apr 2018 21:00:11 +0000 (14:00 -0700)]
Import translations. DO NOT MERGE
Change-Id: I5d954e7efdb153eb01f0d8f68d483a6e1e5af0f8
Auto-generated-cl: translation import
Milo Sredkov [Thu, 12 Apr 2018 11:52:43 +0000 (12:52 +0100)]
Address visual inconsistency in smart replies
Address the major style differences and make the smart reply buttons
fit better with the other notification UI elements.
This CL does not yet address all the isues but removes the most
obvious inconsistencies.
Screenshot before: https://screenshot.googleplex.com/90QVvxJmUJ3.png
Screenshot after: https://screenshot.googleplex.com/2C8cMQgTVBG.png
Bug:
73605520
Test: In Notify post a Messaging notification with Large chices
Change-Id: Ide285c21c7bf83e9f06ade6912fd13cb3e4b9024
TreeHugger Robot [Sat, 14 Apr 2018 16:39:30 +0000 (16:39 +0000)]
Merge "Don't create recovery snapshot until it contains at least one key." into pi-dev
OSDN Git Service
