Commit Graph

37633 Commits

Author SHA1 Message Date
TreeHugger Robot
ec3e297453 Merge "Restart loader in onResume" 2017-06-02 00:32:23 +00:00
Sheng Wang
61a420df95 Merge "Volume can not be updated in Sound&notification" am: c0fdbab185 am: 161e3d14e1
am: 9dbd34a3d9

Change-Id: I50a30452b6e0162070960ffdc35197ddef785609
2017-06-02 00:27:56 +00:00
Sheng Wang
9dbd34a3d9 Merge "Volume can not be updated in Sound&notification" am: c0fdbab185
am: 161e3d14e1

Change-Id: Ie08f168cc2bf544d1f44a05f100a47d50ae15dd5
2017-06-02 00:25:17 +00:00
Sheng Wang
161e3d14e1 Merge "Volume can not be updated in Sound&notification"
am: c0fdbab185

Change-Id: I467cb1cc5e0dbe49e383c7eace0be4475c21f762
2017-06-02 00:21:45 +00:00
Treehugger Robot
c0fdbab185 Merge "Volume can not be updated in Sound&notification" 2017-06-02 00:14:16 +00:00
Amit Mahajan
7243db2572 Check for null mReadOnlyApnTypes.
Test: none
Bug: 62247121
Change-Id: I6866bf2df8d4cb46dd75b94ab88c1e62e65ddda7
2017-06-01 16:39:40 -07:00
TreeHugger Robot
31d5b3de6f Merge "Add strings in battery usage page" 2017-06-01 23:38:43 +00:00
Sheng Wang
8c329af634 Volume can not be updated in Sound&notification
After "onActivityPause()" is invoked and "onActivityResume()"
is invoked again, "mVolumizer" is not empty object,
so volume is not updated.

To fix this issue, set "mVolumizer" is null in "onActivityPause()",
if "onActivityResume()" is invoked again, recreate "mVolumizer"
and update volume.

Bug: 37558283
Test: manual, cherrypicking from AOSP
Change-Id: Id91064ea32305b5bf203f34e31988ac923beee6d
2017-06-01 16:35:03 -07:00
Suprabh Shukla
7e59ec499c Always returning the updated preference summary
AppEntry is not being updated when opening nested app info activities,
which led to stale preference summary being returned for external
sources details.

Test: Manually checked the preference summary is correctly reflecting
the state of the switch.
Existing test ExternalSourcesSettingsTest passes.

Bug: 37487637
Change-Id: Id3c665c7cc7231023f4110725b3b15e43284de97
2017-06-01 15:58:24 -07:00
TreeHugger Robot
34494a53c9 Merge "Add group name into channel summary, if applicable." 2017-06-01 22:57:26 +00:00
jackqdyulei
210110f4ed Restart loader in onResume
We need to refresh batterystatsHelper in onResume, so we need to
call restartLoader instead of initLoader

Bug: 62237848
Test: RunSettingsRoboTests
Change-Id: I6f7e1b57b945c92d34587ca24db192600e7f797f
2017-06-01 15:57:08 -07:00
Antony Sargent
ede1e7f16a Add strings to use in Bluetooth device forget confirmation
We're going to add a confirmation dialog for when the user chooses to
unpair with (or "forget") a Bluetooth device on the device details
page. These are the strings we'll use in the dialog.

Bug: 37955181
Bug: 35876580
Test: (should be covered by existing tests)
Change-Id: Iec08fcc2730129c0e9a8f54cc94ab8aad958f353
2017-06-01 15:55:42 -07:00
jackqdyulei
d5e20e14af Refine the ProgressCategory
1. Make the progressbar align with settings gear
2. Make text vertical center

Bug: 37190885
Test: Screenshot
Change-Id: Ib69b949179a0e097b78717cbe93c39aa0064ea9e
2017-06-01 15:48:56 -07:00
TreeHugger Robot
8da7a39697 Merge "Update strings for anomaly detection" 2017-06-01 22:46:12 +00:00
Andrew Sapperstein
5a804c105f Merge "Add search bar to SearchActivity." into oc-dev am: fbc9035bcd
am: 0a35757003  -s ours

Change-Id: Icad5a856745ddafc5f79aecd81eceed46aeabb29
2017-06-01 22:28:08 +00:00
Andrew Sapperstein
0a35757003 Merge "Add search bar to SearchActivity." into oc-dev
am: fbc9035bcd

Change-Id: I63823bc03fe97fe683c9775b1b28f5cc770ae4e7
2017-06-01 22:17:44 +00:00
TreeHugger Robot
fbc9035bcd Merge "Add search bar to SearchActivity." into oc-dev 2017-06-01 22:02:32 +00:00
TreeHugger Robot
8d9177a06e Merge "Hide saved network preference when there is none." 2017-06-01 21:41:39 +00:00
Mikhail Malakhov
bd5729b7dc Sometime, Settings app crash when AllowBindAppWidgetActivity closing
Process: com.android.settings
E AndroidRuntime: java.lang.RuntimeException:
Unable to destroy activity {com.android.settings/
com.android.settings.AllowBindAppWidgetActivity}:
java.lang.IllegalArgumentException: Receiver not registered:
android.app.Activity$1@5817135

Change-Id: I0f8b61f4c1772b43bffd949928ccaafd295f5fac
Signed-off-by: Mikhail Malakhov <malakhv@gmail.com>
2017-06-02 00:38:27 +03:00
jackqdyulei
040c21bcb5 Add strings in battery usage page
Add prefix:
1. "Used for" for foreground time
2. "Active for" for background time

Bug: 37162357
Test: RunSettingsRoboTests
Change-Id: Ifd4762640bd5ad98ce64ab174f7a7f44dbb1aa27
2017-06-01 14:38:00 -07:00
Matthew Fritze
5baaa7aef9 Merge "Prevent crash when removing duplicates" into oc-dev am: 7a148b9e09
am: 752b18191b  -s ours

Change-Id: I05c487d4a8fc39944065a7f305afb87128e25400
2017-06-01 21:29:35 +00:00
Matthew Fritze
752b18191b Merge "Prevent crash when removing duplicates" into oc-dev
am: 7a148b9e09

Change-Id: I9ea047489b44bc538033343a6350a5abb8afef63
2017-06-01 21:24:36 +00:00
TreeHugger Robot
7a148b9e09 Merge "Prevent crash when removing duplicates" into oc-dev 2017-06-01 21:12:11 +00:00
Alison Cichowlas
8ad2fa6865 Add group name into channel summary, if applicable.
Bug: 36642898
Test: ran integration & robo tests (no new failures); verified manually with apps with channels & without.

Change-Id: I16a255b0e5d929f4485d3725bd18179e6f411c03
2017-06-01 17:04:36 -04:00
Fan Zhang
396938f29b Merge "Add method to disable "disable" button in installed app UI" into oc-dev am: e12790e34f
am: 7d190dd69d  -s ours

Change-Id: Ib535478ef6de2a75d8675553d0f350f636d12e63
2017-06-01 20:34:53 +00:00
Andrew Sapperstein
c0a9fe9926 Merge "Initial search bar implementation." into oc-dev am: 91fe76263f
am: 9448f68171  -s ours

Change-Id: I45f0f3381052d2a57612134cf0ffe45711f50311
2017-06-01 20:28:37 +00:00
Fan Zhang
7d190dd69d Merge "Add method to disable "disable" button in installed app UI" into oc-dev
am: e12790e34f

Change-Id: I4a5223a27c98f7ae9422fb017f4206721080890a
2017-06-01 20:28:34 +00:00
TreeHugger Robot
e12790e34f Merge "Add method to disable "disable" button in installed app UI" into oc-dev 2017-06-01 20:24:06 +00:00
TreeHugger Robot
f43f4c3131 Merge "Move BatteryInfo to settings from settingslib" 2017-06-01 20:16:42 +00:00
Alison Cichowlas
afe44799f7 Delay adding app settings link until data fetch returns,
to avoid reordering/visible misplaced "additional settings
in the app" during transition.

Bug: 62051521
Test: manual with transition scale turned to 10x sloooow.
Change-Id: I50666fbcb2a14344bbdbb2f4347c8470edb96619
2017-06-01 16:07:32 -04:00
xudiwen
52c031edae Merge "NullPointerException when running monkey test in IccLockSettings" am: 2c8d826b01 am: 957c4d7720 am: 0ff0487b51
am: ecfbe17684

Change-Id: I0ecfb03dfdc7cafeb82a771ff87a33bf0408b961
2017-06-01 20:02:14 +00:00
Andrew Sapperstein
9448f68171 Merge "Initial search bar implementation." into oc-dev
am: 91fe76263f

Change-Id: I7e6921134a239e136aaf6380ab4d7993e943435a
2017-06-01 20:01:49 +00:00
jackqdyulei
3e36c649c5 Merge "Add method to calculate last full charge time" into oc-dev am: d4991dc24d
am: 42790ccd84  -s ours

Change-Id: I09c4fdc402133470177817ca4fd713c372be2015
2017-06-01 20:01:42 +00:00
TreeHugger Robot
ee8ac88f82 Merge "Add search bar to SearchActivity." 2017-06-01 19:57:20 +00:00
Andrew Sapperstein
91fe76263f Merge "Initial search bar implementation." into oc-dev 2017-06-01 19:52:07 +00:00
Fan Zhang
015c7706e4 Hide saved network preference when there is none.
We already do this when wifi is enabled. This change brings same
behavior when wifi is off.

Change-Id: I44301fe46a6183735f8be71c80cfe719ad0e82b4
Fix: 62094681
Test: runtest --path tests/unit/src/com/android/settings/wifi/WifiSettingsUiTest.java
2017-06-01 12:38:08 -07:00
TreeHugger Robot
b42162c819 Merge "Pass component name into SuggestionFeatureProvider" 2017-06-01 19:33:29 +00:00
xudiwen
ecfbe17684 Merge "NullPointerException when running monkey test in IccLockSettings" am: 2c8d826b01 am: 957c4d7720
am: 0ff0487b51

Change-Id: I22cd436533a745a415a49122fe2469ef9a96cdc9
2017-06-01 19:09:25 +00:00
jackqdyulei
42790ccd84 Merge "Add method to calculate last full charge time" into oc-dev
am: d4991dc24d

Change-Id: I4d8bd3099f493497adeb9afe42395225d7fb949c
2017-06-01 19:05:44 +00:00
xudiwen
0ff0487b51 Merge "NullPointerException when running monkey test in IccLockSettings" am: 2c8d826b01
am: 957c4d7720

Change-Id: I6f872dc828e25a849cfa5f2a4c56961f94b63541
2017-06-01 19:05:23 +00:00
TreeHugger Robot
21fc59464b Merge "Bluetooth string changes" 2017-06-01 19:04:07 +00:00
xudiwen
957c4d7720 Merge "NullPointerException when running monkey test in IccLockSettings"
am: 2c8d826b01

Change-Id: I8d54ebc4a699bd57631acc2150662cb923ca0015
2017-06-01 19:01:50 +00:00
TreeHugger Robot
d4991dc24d Merge "Add method to calculate last full charge time" into oc-dev 2017-06-01 18:55:54 +00:00
Treehugger Robot
2c8d826b01 Merge "NullPointerException when running monkey test in IccLockSettings" 2017-06-01 18:51:44 +00:00
Salvador Martinez
0e8c88376c Move BatteryInfo to settings from settingslib
This CL simply moves BatteryInfo from settingslib to settings and
makes sure the tests still pass. No other changes are made other than
imports or minor changes needed to make sure existing code does not
break.

Test: Robotests still pass
Bug: 38399275
Bug: 38398949
Bug: 38399654
Change-Id: I59803348e2780b7676ccc6c43234a586c184d71f
2017-06-01 11:34:08 -07:00
jackqdyulei
5fefa5337e Don't index High usage summary
Because the strings inside are dynamic

Bug: 62069270
Test: RunSettingsRoboTests still pass
Change-Id: I744179bef89cfaff403f9ce65fcfc0f03c04350b
2017-06-01 11:28:36 -07:00
jackqdyulei
b2acbb72ac Update strings for anomaly detection
Bug: 62069270
Test: Build
Change-Id: I7f5a00cfd39d85a08054e334ace76ebf7898850c
2017-06-01 11:27:32 -07:00
Matthew Fritze
ebd80e68ab Prevent crash when removing duplicates
The method that crashes is removed in O-DR, and thus
does not need to be merged down.

Change-Id: If30bd8bd92d578133984f7f35e7ec5288adfc390
Fixes: 62100634
Test: make RunSettingsRoboTests
Merged-In: Id36f7bf4ceaaa3a2bd326ecafbfe97fd0b247df2
2017-06-01 11:13:37 -07:00
Andrew Sapperstein
fac61b71e5 Add search bar to SearchActivity.
Styling doesn't look exactly right yet but there's a bar.
Creates an ItemDecoration to add a spacer above the first view.

Removes the action bar and replaces it with a SearchView
inside of a CardView.

Remaining work: pixel pushing

Bug: 37477506
Test: make RunSettingsRoboTests
Change-Id: Ibf38c3c2725551bc4cd90e98d0020ec49c2eab2b
Merged-In: I4a0f0c91c51ff5820b61a596520d80a3337c3466
2017-06-01 11:02:56 -07:00
Andrew Sapperstein
893cb0987a Add search bar to SearchActivity.
Styling doesn't look exactly right yet but there's a bar.
Creates an ItemDecoration to add a spacer above the first view.

Removes the action bar and replaces it with a SearchView
inside of a CardView.

Remaining work: pixel pushing

Bug: 37477506
Test: make RunSettingsRoboTests
Change-Id: I4a0f0c91c51ff5820b61a596520d80a3337c3466
2017-06-01 11:01:00 -07:00