Commit Graph

38305 Commits

Author SHA1 Message Date
TreeHugger Robot
8f8fb1c162 Merge "Add more space above the first item in choose usb mode dialog." 2017-06-16 23:35:24 +00:00
Doris Ling
c72355f60b Move Apps & notifications -> App permissions into Advanced.
- decrease the tile limit for the Apps and notification dashboard to
show 1 less item initiallly.

Change-Id: I334661ced410f9c077f01d7d27a8c3555afdccb9
Fix: 62486427
Test: visual
2017-06-16 16:31:59 -07:00
Maurice Lam
33cad22f4f Merge "Make confirm lock screen use the right theme" into oc-dr1-dev am: 98a9d341c8
am: 9b8f36e359

Change-Id: I08f5a9da6f6fac3206a5bb6df2e2106e91033863
2017-06-16 22:42:26 +00:00
Fan Zhang
fdcb8b1dc8 Hide app info button from app notification settings header
Change-Id: I10803e78fe4f30c2d84ec795c343ed660aab7762
Bug: 62708686
Test: visual and runtest --path AppNotificationSettingsTest.java
(cherry picked from commit 5d811c40d3)
2017-06-16 22:30:31 +00:00
Fan Zhang
470e79a286 Misc fixes for notification
- Tweak alignment for footer preference icon and text
- Hide app info button from app notification settings header

Merged-In: I10803e78fe4f30c2d84ec795c343ed660aab7762
Change-Id: Ia95fc30025c042635ad6467c7fde51991b0c47d9
Fix: 62138362
Fix: 62708686
Test: visual and runtest --path AppNotificationSettingsTest.java
2017-06-16 15:27:51 -07:00
TreeHugger Robot
d140cad1bc Merge "Hide app info button from app notification settings header" 2017-06-16 22:26:09 +00:00
Maurice Lam
9b8f36e359 Merge "Make confirm lock screen use the right theme" into oc-dr1-dev
am: 98a9d341c8

Change-Id: Iac233acde24c37fd7f93faba312bc5d894bb224d
2017-06-16 22:17:18 +00:00
TreeHugger Robot
98a9d341c8 Merge "Make confirm lock screen use the right theme" into oc-dr1-dev 2017-06-16 22:08:06 +00:00
Lei Yu
69050d2bda Merge "Update wakelock detector" into oc-dr1-dev am: e2530c2f62
am: 25371b152c

Change-Id: I980c6b356862e9d8af46e36e08f3d2cc07d5cf65
2017-06-16 21:12:21 +00:00
Lei Yu
25371b152c Merge "Update wakelock detector" into oc-dr1-dev
am: e2530c2f62

Change-Id: Ib3e2aef02b5b3484ffbc43648210781d39e89a55
2017-06-16 20:52:09 +00:00
jackqdyulei
837200041f Move "Received files" in BluetoothSettings
Move it from menu to preference

Also clean up the code about menu since there is no menu anymore
in BluetoothSettings

Bug: 35876447
Test: RunSettingsRoboTests
Change-Id: I4a3821595a0cc75382f1cf74bcafb3ecc44cc178
2017-06-16 13:45:46 -07:00
Lei Yu
e2530c2f62 Merge "Update wakelock detector" into oc-dr1-dev 2017-06-16 20:30:37 +00:00
Maurice Lam
f3c5b4d3eb Make Accessibility settings a SUW suggestion
Make it a suggestion so that SUW can show it during deferred setup

Test: Manual
Bug: 38506169
Change-Id: I03d5d0d7c2e5168b8d3ccccedce74620675865b8
2017-06-16 13:20:54 -07:00
Fan Zhang
5d811c40d3 Hide app info button from app notification settings header
Change-Id: I10803e78fe4f30c2d84ec795c343ed660aab7762
Bug: 62708686
Test: visual and runtest --path AppNotificationSettingsTest.java
2017-06-16 13:12:44 -07:00
Maurice Lam
846172564e Make confirm lock screen use the right theme
Test: cd tests/robotests && mma
Bug: 62348472
Change-Id: Ie05c2e6adba8450a1092f0fefcad6b003398de7d
2017-06-16 13:02:36 -07:00
Shinji Sogo
1bed022001 Merge "Cleanup unused WifiP2pSettings code in WifiSettings" am: cd1f7a3146 am: 27ca1272a5 am: 879fd4b406
am: d6db6d8938

Change-Id: I0d270d27a3f8b5050c9b14519bec16e2937ce12e
2017-06-16 19:13:22 +00:00
Shinji Sogo
d6db6d8938 Merge "Cleanup unused WifiP2pSettings code in WifiSettings" am: cd1f7a3146 am: 27ca1272a5
am: 879fd4b406

Change-Id: Ie7b7de6ab3e9d8ebf13beffffd0ca0aa4026e8ea
2017-06-16 19:06:38 +00:00
Shinji Sogo
879fd4b406 Merge "Cleanup unused WifiP2pSettings code in WifiSettings" am: cd1f7a3146
am: 27ca1272a5

Change-Id: I70f81796a7c29c416729cc7fd7b4fd8150fdc981
2017-06-16 19:00:18 +00:00
Shinji Sogo
27ca1272a5 Merge "Cleanup unused WifiP2pSettings code in WifiSettings"
am: cd1f7a3146

Change-Id: I18adec05022abe4d96f3aac2e893a5b5cbc7f2dc
2017-06-16 18:53:50 +00:00
Treehugger Robot
cd1f7a3146 Merge "Cleanup unused WifiP2pSettings code in WifiSettings" 2017-06-16 18:41:42 +00:00
Lei Yu
bc723ba161 Merge "Display anomaly in battery usage page" into oc-dr1-dev am: b275471725
am: 1522839283

Change-Id: Ia234aa8a6e478ae7e5dac88867cef9297ff74ceb
2017-06-16 17:11:07 +00:00
Lei Yu
1522839283 Merge "Display anomaly in battery usage page" into oc-dr1-dev
am: b275471725

Change-Id: Ib9a7a971bdd3c9685287d25985f06f39507dbdad
2017-06-16 17:06:37 +00:00
Lei Yu
b275471725 Merge "Display anomaly in battery usage page" into oc-dr1-dev 2017-06-16 16:55:53 +00:00
Christine Franks
0adb62176d Merge "Update Night display icon in Settings" into oc-dr1-dev am: ddd692cf1a
am: 3fb1655289

Change-Id: I10bf8db6918676588558c453f36b71c6f82872f2
2017-06-16 14:47:57 +00:00
Christine Franks
3fb1655289 Merge "Update Night display icon in Settings" into oc-dr1-dev
am: ddd692cf1a

Change-Id: I1af8434bc68283f5579cdf01901022d292ba2a13
2017-06-16 14:43:56 +00:00
Christine Franks
ddd692cf1a Merge "Update Night display icon in Settings" into oc-dr1-dev 2017-06-16 14:36:12 +00:00
Bill Yi
251cbcbcc5 Import translations. DO NOT MERGE
Change-Id: I3f7cec1865c8447d601b0d369de105da3fc7afa1
Auto-generated-cl: translation import
2017-06-16 07:12:33 -07:00
Bill Yi
76d55da74b Import translations. DO NOT MERGE
Change-Id: I1c041b74f7d78f0b69a4c8553118ed069393586e
Auto-generated-cl: translation import
2017-06-16 07:00:00 -07:00
Bill Yi
4d29fa9938 Import translations. DO NOT MERGE
Change-Id: I0774e86c6160591d1048a8f60c74d29aecaa8c9f
Auto-generated-cl: translation import
2017-06-16 06:33:12 -07:00
Tony Mak
d1e089b6c3 Merge "Fix searching work app in settings" into oc-dr1-dev am: e3d890eaae -s ours
am: caac960e1a  -s ours

Change-Id: I085d29824d90f74b5254f1efc4e18056d8814eb4
2017-06-16 13:06:23 +00:00
Tony Mak
caac960e1a Merge "Fix searching work app in settings" into oc-dr1-dev
am: e3d890eaae  -s ours

Change-Id: Ifbb300aa90cad12431121c380aa306d04dedb5bd
2017-06-16 13:01:51 +00:00
TreeHugger Robot
e3d890eaae Merge "Fix searching work app in settings" into oc-dr1-dev 2017-06-16 12:55:40 +00:00
Charles He
4e9713fc96 Merge "Escape apostrophes in ConfirmCredential strings." into oc-dr1-dev am: add67648c7
am: 569a238509

Change-Id: Ibae09f8a237e528aa9122d1fc26142e1ede10629
2017-06-16 11:49:14 +00:00
Charles He
569a238509 Merge "Escape apostrophes in ConfirmCredential strings." into oc-dr1-dev
am: add67648c7

Change-Id: I2058ec725fb10fc0a8572237d5927f70b3d89525
2017-06-16 11:44:42 +00:00
Charles He
add67648c7 Merge "Escape apostrophes in ConfirmCredential strings." into oc-dr1-dev 2017-06-16 11:36:07 +00:00
Tony Mak
6ae20193e0 Merge "Fix searching work app in settings NO PARTIAL RERUN am: 5651e0f2ce -s ours am: a59e02fd58" into oc-dr1-dev-plus-aosp
am: 41a66cccc1  -s ours

Change-Id: I164ec412f672c397ec5dc79077690e2ec57a960f
2017-06-16 11:03:45 +00:00
Tony Mak
eaa186de55 Merge "Fix searching work app in settings" into oc-dr1-dev-plus-aosp
am: 248cdec3e2  -s ours

Change-Id: Id990b4dd2af8fa724facf501f36b2d587a34d908
2017-06-16 11:03:13 +00:00
Android Build Merger (Role)
41a66cccc1 Merge "Fix searching work app in settings NO PARTIAL RERUN am: 5651e0f2ce -s ours am: a59e02fd58" into oc-dr1-dev-plus-aosp 2017-06-16 10:59:26 +00:00
TreeHugger Robot
248cdec3e2 Merge "Fix searching work app in settings" into oc-dr1-dev-plus-aosp 2017-06-16 10:59:23 +00:00
Tony Mak
8a92db2487 Fix searching work app in settings NO PARTIAL RERUN am: 5651e0f2ce am: 80cdf176e9 -s ours
am: 5d25a0c796  -s ours

Change-Id: I80bc94d6fff7eef72efb21392ce6c43ab0dd0ea6
2017-06-16 10:59:13 +00:00
Tony Mak
ad168d2907 Fix searching work app in settings NO PARTIAL RERUN am: 5651e0f2ce -s ours
am: a59e02fd58

Change-Id: Idb771b9bca8e0e1d93dc9f9f8b9312bae33d9165
2017-06-16 10:59:11 +00:00
Tony Mak
c96bbcff90 Fix searching work app in settings
Test: m -j RunSettingsRoboTests
Test: Observe search result with badged icon and showing work app info
when tapping on it.
Test: personal app search result is still working
Test: Non app search result is working

Fix: 62366873

Merged-in: I333372699b263d02cc4083289dc746c7aacd414d


Change-Id: I333372699b263d02cc4083289dc746c7aacd414d
(cherry picked from commit 3bef8ce30a)
2017-06-16 10:56:11 +00:00
Tony Mak
9f3f5f4fed Fix searching work app in settings
Test: m -j RunSettingsRoboTests
Test: Observe search result with badged icon and showing work app info
when tapping on it.
Test: personal app search result is still working
Test: Non app search result is working

Fix: 62366873
Merged-in: I333372699b263d02cc4083289dc746c7aacd414d


Change-Id: I333372699b263d02cc4083289dc746c7aacd414d
(cherry picked from commit 3bef8ce30a)
2017-06-16 10:55:49 +00:00
Tony Mak
a59e02fd58 Fix searching work app in settings NO PARTIAL RERUN
am: 5651e0f2ce  -s ours

Change-Id: I90afad3ac35c46c64e801631d36d24750a5858f4
2017-06-16 10:55:11 +00:00
Tony Mak
5d25a0c796 Fix searching work app in settings NO PARTIAL RERUN am: 5651e0f2ce
am: 80cdf176e9  -s ours

Change-Id: Iea2c278565436cde6cd1fb8d5c58f7b972c7c2e7
2017-06-16 10:55:11 +00:00
TreeHugger Robot
edaf453a33 Merge "Remove some dead code" 2017-06-16 02:19:43 +00:00
Maurice Lam
2d33b58e7c Allow skipping PIN setup screen am: 4c930fc2d5
am: adb206fec5

Change-Id: I3ea2310633c0a01858a9f6d5cf04793bd40cd1b0
2017-06-16 01:37:46 +00:00
TreeHugger Robot
af3e56bf45 Merge "May nfc_payments_how_it_works layout scrollable." 2017-06-16 01:32:18 +00:00
Maurice Lam
adb206fec5 Allow skipping PIN setup screen
am: 4c930fc2d5

Change-Id: I778a8a9d1d1ed98c91057357ec6ee9af6daa326c
2017-06-16 01:15:20 +00:00
Daniel Nishi
b088010d12 Add more sane multi-profile app attribution.
Due to issues w.r.t. attribution across multiple users, we originally
duplicated the previous implementation which zeroed out the sizes. This,
however, caused system bloat due to the change in how we calculate the
system size.

By attributing apps which do not exist in the primary profile to the
first user that shows up with it installed, we can avoid accidentally
attributing it to the system size.

Bug: 62623731
Test: Settings unittest & Settings robotest
Change-Id: I9514c9ecef62ea6270723f62e6bf27c69b75f180
2017-06-15 17:25:10 -07:00