PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
43,056 Commits 1 Branch 0 Tags
a6b969b934c0e2b131330fdaf857555dc35e9e7b
Commit Graph

43056 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Beverly
a6b969b934 Merge "System gets its own dnd toggle" into pi-dev 
am: 1e9268b52e

Change-Id: I7d697d483791a30a8c6ad966dad760bcc00e02f3
 2018-03-07 16:53:44 +00:00
TreeHugger Robot
1e9268b52e Merge "System gets its own dnd toggle" into pi-dev 2018-03-07 16:39:40 +00:00
Anton Hansson
286caf5a4d Merge "packages/apps/Settings: Set LOCAL_SDK_VERSION where possible. DO NOT MERGE" am: 02e3229580 -s ours 
am: 57dc4a18c2  -s ours

Change-Id: Ic5827ccc458a510e7def73966de50b6aae8ed67f
 2018-03-07 11:57:20 +00:00
Anton Hansson
57dc4a18c2 Merge "packages/apps/Settings: Set LOCAL_SDK_VERSION where possible. DO NOT MERGE" 
am: 02e3229580  -s ours

Change-Id: I24575750c99fe081f28ea7a5f73307e3bfd8c950
 2018-03-07 11:51:48 +00:00
Anton Hansson
02e3229580 Merge "packages/apps/Settings: Set LOCAL_SDK_VERSION where possible. DO NOT MERGE" 2018-03-07 11:27:19 +00:00
Bernardo Rufino
819f53a7ee Catch SecurityException from enabling backup activity 
am: 368b5a6b2c

Change-Id: I47613de2c00db93d906414f1e51baea9cbc7606a
 2018-03-07 11:02:45 +00:00
Bernardo Rufino
368b5a6b2c Catch SecurityException from enabling backup activity 
Cases where the activity is already enabled and the account is an unicorn
account.

Test: Opened activity from backup settings w/ unicorn account, verified
      no crash
Bug: 74199770
Change-Id: I7dc30d22b186ff19cf7c40fda0363ff1288224d1
 2018-03-07 08:49:31 +00:00
Yoshinori Hirano
fd8527901e Merge "Add SettingsMultiSelectListPreference style" into pi-dev 
am: 106825383a

Change-Id: I6a796081208050d58a42a32ec69a2bd20cee1fcf
 2018-03-07 04:19:47 +00:00
Doris Ling
9f6608a729 Merge "Add strings for audio output switcher." into pi-dev 
am: 6775ff9542

Change-Id: Id400699f8d74cdda74721fdd193dc809d998bce5
 2018-03-07 04:17:56 +00:00
jackqdyulei
da31b26d8b Merge changes from topic "tip_new_page-pi-dev" into pi-dev 
am: a276b8d580

Change-Id: Icb1d923c07e48466b7f024e091d01c69a001073e
 2018-03-07 04:10:32 +00:00
TreeHugger Robot
106825383a Merge "Add SettingsMultiSelectListPreference style" into pi-dev 2018-03-07 03:47:20 +00:00
TreeHugger Robot
6775ff9542 Merge "Add strings for audio output switcher." into pi-dev 2018-03-07 03:42:13 +00:00
TreeHugger Robot
a276b8d580 Merge changes from topic "tip_new_page-pi-dev" into pi-dev 
* changes:
  Hook up the new page to PowerUsageSummary
  Create new PowerUsageAdvanced page
  Change current PowerUsageAdvanced to legacy code
 2018-03-07 03:40:50 +00:00
jackqdyulei
3968b061e8 Merge "Add auto restriction preference" into pi-dev 
am: f178692bc5

Change-Id: I097a604222b45e5048e0f5e9c831766b2bf0b5e5
 2018-03-07 03:29:43 +00:00
Fan Zhang
f90db69a3c Merge "Stop wrapping RoundedHomepageIcon if it's already wrapped." into pi-dev 
am: 710207f024

Change-Id: Ic56c0608d90442fffa26ac04f6a7db3182b3e0e6
 2018-03-07 03:22:18 +00:00
Doris Ling
5675610456 Merge "Add intent fields when launching instant app." into pi-dev 
am: dce675c158

Change-Id: I2934676d8253bb6df67834f2d02a38154c7b3eb0
 2018-03-07 03:01:09 +00:00
TreeHugger Robot
f178692bc5 Merge "Add auto restriction preference" into pi-dev 2018-03-07 02:32:17 +00:00
Yoshinori Hirano
447192f903 Add SettingsMultiSelectListPreference style 
There is no OK and CANCEL button when changing APN Bearer.
To fix this issue, OK and CANCEL button should be added to
SettingsMultiSelectListPreference style.

Fixes: 66928311
Test: manual - Add a new APN and tap Bearer

Change-Id: I2b5719a7c1fdb721b15308e0eef7db3e6398e097
 2018-03-06 17:45:07 -08:00
Doris Ling
b5884f48d5 Merge "Fix crash in battery info settings page." into pi-dev 
am: 83d9047ef4

Change-Id: I569b1c95dffe373da79ca5a8193597f9a5fe830b
 2018-03-07 01:44:09 +00:00
TreeHugger Robot
710207f024 Merge "Stop wrapping RoundedHomepageIcon if it's already wrapped." into pi-dev 2018-03-07 01:21:20 +00:00
jackqdyulei
094278e636 Hook up the new page to PowerUsageSummary 
Add a menu to point to the new page

Bug: 73300636
Test: RunSettingsRoboTests
Change-Id: I9956e349cdbbe2cd752bdf65020a540a329bdee3
Merged-In: I9956e349cdbbe2cd752bdf65020a540a329bdee3
 2018-03-06 17:20:06 -08:00
TreeHugger Robot
dce675c158 Merge "Add intent fields when launching instant app." into pi-dev 2018-03-07 00:59:20 +00:00
jackqdyulei
31a5960424 Create new PowerUsageAdvanced page 
This page contains the graph at the top and app list at the bottom

In this cl, we reused some part of the code in PowerUsageAdvancedLegacy
to construct the graph, and also used controller to construct the app
list(So glad that we extracted it to controller before..)

Bug: 73300636
Test: RunSettingsRoboTests
Change-Id: I30afbc0327a5186f8280f5e3678330b363e2dc0d
Merged-In: I30afbc0327a5186f8280f5e3678330b363e2dc0d
 2018-03-06 16:10:30 -08:00
Victor Chang
b6ebf73183 Merge "Time zone, Region, UTC picker" into pi-dev 
am: 2e79a7cc42

Change-Id: I356812eb0b04145b02cbc785f47fb1edba986916
 2018-03-06 23:34:01 +00:00
jackqdyulei
d0086188d2 Change current PowerUsageAdvanced to legacy code 
In future cl, we will create new PowerUsageAdvanced page.

Bug: 73300636
Test: Build
Change-Id: I608f6b1fb9bf29a6ef5d7f9d67bcb6eea9e7aec7
Merged-In: I608f6b1fb9bf29a6ef5d7f9d67bcb6eea9e7aec7
 2018-03-06 15:27:20 -08:00
Doris Ling
7b59cde2ce Add strings for audio output switcher. 
Bug: 74130772
Test: rebuild
Change-Id: I84b702b69cc0cd23caeebb441ad8310b56441b5b
 2018-03-06 15:15:01 -08:00
Bill Yi
3a2ffddc3a Merge "Import translations. DO NOT MERGE" into pi-dev 
am: bcf3e12556  -s ours

Change-Id: I61a0849e3af8523abcefe06b2aac8a77e55e9aac
 2018-03-06 23:02:26 +00:00
Fan Zhang
4fdf0b461d Stop wrapping RoundedHomepageIcon if it's already wrapped. 
On homepage, if an icon is already wrapped in RoundedHomepageIcon, we
shouldn't wrap it more. Otherwise each time we do this it will add a few
dp padding around the bitmap.

Change-Id: I5313a38f4bd128272d7b4e05209aaee72c690c55
Fixes: 73295342
Test: robotest
 2018-03-06 14:52:03 -08:00
TreeHugger Robot
83d9047ef4 Merge "Fix crash in battery info settings page." into pi-dev 2018-03-06 22:47:15 +00:00
Victor Chang
2e79a7cc42 Merge "Time zone, Region, UTC picker" into pi-dev 2018-03-06 22:01:35 +00:00
TreeHugger Robot
bcf3e12556 Merge "Import translations. DO NOT MERGE" into pi-dev 2018-03-06 21:59:34 +00:00
Alex Cruz
fc21073438 Merge "Change encryption preference's summary accordingly" into pi-dev 
am: 5218829f68

Change-Id: I371d320e07ce35543d218ccf0e75e5e2438f1e4c
 2018-03-06 21:43:13 +00:00
Doris Ling
c08984befd Add intent fields when launching instant app. 
- add browseable category, package name, and new task flag.

Change-Id: Ie558f5885b5f0f78c88241de7c2d7a21cfb9d0fe
Fixes: 74131502
Test: make RunSettingsRoboTests
 2018-03-06 13:37:21 -08:00
jackqdyulei
155c1785e1 Add auto restriction preference 
1. Add method in feature provider to check whether smart battery
is supported
2. Hook up above method to controllers
3. Add auto restriction preference
4. Add tests

Bug: 73002171
Test: RunSettingsRoboTests
Change-Id: Ic314f61ad52e9bedb629b308731cb968bb4b1773
Merged-In: Ic314f61ad52e9bedb629b308731cb968bb4b1773
(cherry picked from commit ab0b0add0a)
 2018-03-06 21:32:56 +00:00
TreeHugger Robot
5218829f68 Merge "Change encryption preference's summary accordingly" into pi-dev 2018-03-06 21:31:07 +00:00
Alex Cruz
a09731f592 Merge "DO NOT MERGE: Change encryption preference's summary accordingly" am: ab5a3898f5 -s ours 
am: 8704b90878  -s ours

Change-Id: Ie2e6a2b036e08796f34ed7fdd9e1bce46bf681d6
 2018-03-06 21:28:29 +00:00
Doris Ling
8aaf313532 Merge "Create a new list when building suggestion data." into pi-dev 
am: b76682afcb

Change-Id: I5ecf9a7a5c7e6654129d7d3ae2504a5553c04d0e
 2018-03-06 21:22:57 +00:00
Doris Ling
b76682afcb Merge "Create a new list when building suggestion data." into pi-dev 2018-03-06 21:09:24 +00:00
Alex Cruz
8704b90878 Merge "DO NOT MERGE: Change encryption preference's summary accordingly" 
am: ab5a3898f5  -s ours

Change-Id: Ie07848592baa2ee12806a1aa106e75c9f1cd4a92
 2018-03-06 20:44:19 +00:00
Fan Zhang
ea68f2c467 Merge "Update pref fragment for "see all" in app & notification" into pi-dev 
am: 60e108788c

Change-Id: I5e8a4c9aa1676343d61cfd65817372d2dca32ee1
 2018-03-06 20:27:43 +00:00
Doris Ling
b619e51baf Fix crash in battery info settings page. 
- when receive package updates, check if the buttons preference is
available before trying to update the UI.

Change-Id: Ie3482b94c84cd55e9a138af4719a031f5167e089
Fixes: 74130214
Test: make RunSettingsRoboTests
 2018-03-06 12:26:54 -08:00
Antoan Angelov
94de70ebf9 Merge "Make "Action not allowed" dialog compliant with Material Spec and replace full screen activities with the dialog." into pi-dev 
am: 95d0b95948

Change-Id: Ia205bc4fdba0b5f8e5ffcb5c05e0e7543dc6a8ce
 2018-03-06 20:11:06 +00:00
TreeHugger Robot
60e108788c Merge "Update pref fragment for "see all" in app & notification" into pi-dev 2018-03-06 20:05:33 +00:00
Bill Yi
b109d2e4e0 Import translations. DO NOT MERGE 
Change-Id: Ia6564078c6d51196f13770bbeb896503e7333c19
Auto-generated-cl: translation import
 2018-03-06 11:59:37 -08:00
Victor Chang
1007fe2c0f Merge "Fix SettingsRoboTests build error with OpenJDK 9" into pi-dev 
am: 6a3bac39bf

Change-Id: If54bf59a1969914c9fbbffaf17f4f687e85f2b71
 2018-03-06 19:52:52 +00:00
Alex Cruz
d2a8b1ff02 Change encryption preference's summary accordingly 
With this change a summary to the encryption preference was added.

415ce9a77d

The problem is that even if you're not encrypted, it says that your phone is.
Is very misleading to the user that don't bother to enter the actual preference
and want to see if they are. This fixes that.

This is cherry-picked from
https://android-review.googlesource.com/#/c/platform/packages/apps/Settings/+/517875/

Test: Go into Settings/Security & Location
Fixes: 68691666
Fixes: 68542516
Change-Id: Iaeaffd340f2e248748f244a947aa71eb8ad4ab94
 2018-03-06 11:40:49 -08:00
Antoan Angelov
95d0b95948 Merge "Make "Action not allowed" dialog compliant with Material Spec and replace full screen activities with the dialog." into pi-dev 2018-03-06 19:37:52 +00:00
TreeHugger Robot
6a3bac39bf Merge "Fix SettingsRoboTests build error with OpenJDK 9" into pi-dev 2018-03-06 19:24:48 +00:00
Treehugger Robot
ab5a3898f5 Merge "DO NOT MERGE: Change encryption preference's summary accordingly" 2018-03-06 18:55:54 +00:00
Doris Ling
05811609c7 Create a new list when building suggestion data. 
- using sublist of the original suggestions list may results in
ConcurrentModificationException if the originaly list is being modified.
Create a new list instead to avoid running into the issue.

Change-Id: Ia83a0432be542eeb428d177f6118d26fc2262e93
Fixes: 74194336
Test: run monkey
 2018-03-06 10:55:40 -08:00