Commit Graph

34378 Commits

Author SHA1 Message Date
Doris Ling
c209851d54 Merge "Only register conditions receiver when needed." into oc-dev am: 258e8a8117
am: c5cc3ad8ab

Change-Id: Iee3b638cf04acd6fa6ea01ec5ec24e001e15141a
2017-03-29 20:37:01 +00:00
Doris Ling
05f89968ce Merge "Increase the char limit for the bluetooth tethering strings." into oc-dev am: 6fd47da7c3
am: be2c0fc6a3

Change-Id: Idb1e8fea80a256da483afed6de777f567d80e098
2017-03-29 20:36:48 +00:00
Doris Ling
c5cc3ad8ab Merge "Only register conditions receiver when needed." into oc-dev
am: 258e8a8117

Change-Id: Ifc56d2c84f38c4c924596aff660e7c156166266e
2017-03-29 20:35:44 +00:00
Doris Ling
be2c0fc6a3 Merge "Increase the char limit for the bluetooth tethering strings." into oc-dev
am: 6fd47da7c3

Change-Id: I7e28a6691b6ceabe079aad87fde2389f07789dbc
2017-03-29 20:33:58 +00:00
Doris Ling
258e8a8117 Merge "Only register conditions receiver when needed." into oc-dev 2017-03-29 20:33:21 +00:00
TreeHugger Robot
02a66bef60 Merge "Remove android:visibility attributes from Preferences" 2017-03-29 20:30:27 +00:00
TreeHugger Robot
6fd47da7c3 Merge "Increase the char limit for the bluetooth tethering strings." into oc-dev 2017-03-29 20:26:10 +00:00
Lei Yu
96363bbd14 Merge "Add summary for categories in battery advanced page" 2017-03-29 20:18:22 +00:00
TreeHugger Robot
1a640c794b Merge "Keep EnterprisePrivacySettingsActivity always enabled" 2017-03-29 19:04:23 +00:00
Julia Reynolds
cc1efb0d81 Merge "Don't run postexecute if activity is gone." into oc-dev am: a48cb8d978
am: 388b37c1fe

Change-Id: I96ac7df69f112cfb9f629c21a9da5c20d5b5a028
2017-03-29 18:23:47 +00:00
Julia Reynolds
388b37c1fe Merge "Don't run postexecute if activity is gone." into oc-dev
am: a48cb8d978

Change-Id: I0dc6f1393423509cf7c679395f621828c7948b5f
2017-03-29 18:22:21 +00:00
TreeHugger Robot
a48cb8d978 Merge "Don't run postexecute if activity is gone." into oc-dev 2017-03-29 18:19:04 +00:00
TreeHugger Robot
b7b074454b Merge "Create Controller for app buttons" 2017-03-29 18:18:17 +00:00
Doris Ling
0f01c849cd Only register conditions receiver when needed.
1. Update the dnd receiver to listen when dashboard summary running.
- remove the dnd receiver from Android manifest, and create it inside
the dnd condition.
- add lifecycle implementation to condition manager, so that the dnd
condition can know when to register and unregister the receiver.
- remove getReceiverClass() from dnd condition so that its receiver will
not be disabled by the default condition handling when condition is
silenced.

2. Remove all other conditions receiver from Android manifest.
- the broadcast receivers for HotspotCondition, AirplaneModeCondition,
CellularDataCondition from the manifest and create them inside the
condition classes.
- update Condition.onSilenceChanged() to register/unregister the
receivers instead of enable/disable the receiver class.

Change-Id: Iea6288382680df2b02884d1934b8db85daae404c
Fix: 35968517
Test: make RunSettingsRoboTests
2017-03-29 10:47:04 -07:00
Maurice Lam
97f35625b7 Merge "Revert choose lock header file to non-setup theme" into oc-dev am: 1ecbb7d16d
am: 40c22ec75a

Change-Id: I6d2d29f3166ff88a38c92b1eb3fa00c7c2abe61c
2017-03-29 16:53:56 +00:00
Maurice Lam
40c22ec75a Merge "Revert choose lock header file to non-setup theme" into oc-dev
am: 1ecbb7d16d

Change-Id: I90b936ea2ee30f35e636b9d7aa50d5e641ca9374
2017-03-29 16:48:02 +00:00
Maurice Lam
1ecbb7d16d Merge "Revert choose lock header file to non-setup theme" into oc-dev 2017-03-29 15:45:22 +00:00
Bartosz Fabianowski
28a03aeb48 Remove android:visibility attributes from Preferences
The android:visibility attribute is not applicable to Preferences and
does nothing.

Bug: 32692748
Test: None

Change-Id: I9aa6c3df824b61f96466cc7de6c046870a46678c
2017-03-29 17:13:48 +02:00
Bartosz Fabianowski
92d25fb5f3 Keep EnterprisePrivacySettingsActivity always enabled
The existing code checks during Settings startup whether the device is
managed. If it is not, EnterprisePrivacySettingsActivity is disabled.
If the device then becomes managed, Settings will not notice until
the next restart, causing any attempt to launch this Activity via an
Intent to crash.

This CL changes things so that the Activity is always enabled but
simply does nothing when launched on a non-managed device.

Bug: 34122104
Test: Integration test coming in a separate CL
Change-Id: I0a1dfcb41b405d981309696d97678df6787b4f72
2017-03-29 17:13:39 +02:00
Julia Reynolds
dd8d392d7d Don't run postexecute if activity is gone.
Change-Id: I9133a4d9e4e0fd2a92cc4df786e0bc5407d981fe
Fixes: 36551766
Test: monkey tests
2017-03-29 10:42:07 -04:00
Robin Lee
e21ec8bbf6 resolve merge conflicts of 86c72f7ea5 to oc-dev-plus-aosp
am: 27ae2bb1fe

Change-Id: Ie1e53aa15cffef5f0e99f1601f9bab42dfe1e386
2017-03-29 13:16:37 +00:00
Robin Lee
27ae2bb1fe resolve merge conflicts of 86c72f7ea5 to oc-dev-plus-aosp
Test: make RunSettingsRoboTests -j
Change-Id: If6b87d1caa358335ce56201eab0ed8add8b339e9
2017-03-29 13:54:02 +01:00
Robin Lee
86c72f7ea5 Merge "Optimize code on get UidDetail in AppDataUsage" am: ec6da66728
am: 9fff988f4a

Change-Id: I7f6570192ff654203c835cc23c46139bf10e178e
2017-03-29 12:37:05 +00:00
Robin Lee
9fff988f4a Merge "Optimize code on get UidDetail in AppDataUsage"
am: ec6da66728

Change-Id: Icacae2c9cfaa6064cbb909cc06ff15791c9494d0
2017-03-29 12:34:39 +00:00
Robin Lee
ec6da66728 Merge "Optimize code on get UidDetail in AppDataUsage" 2017-03-29 12:29:36 +00:00
Doris Ling
ce7e043e1d Increase the char limit for the bluetooth tethering strings.
Longer summary text for the bluetooth tethering should be supported for
translation to other languages.

Bug: 36626585
Bug: 36627493
Bug: 36635108
Test: builds
Change-Id: Ia1409520443fd05c54a6c28fc292dd39b1c198b2
(cherry picked from commit 6d17af4d64)
2017-03-29 03:48:24 +00:00
Maurice Lam
f8fb4806cf Revert choose lock header file to non-setup theme
The activity ChooseLockGeneric which inflates the layout file
choose_lock_generic_fingerprint_header is not setup themed, and
therefore should not use setup resources.

Test: Run ChooseLockGenericTest via `am instrument`
Bug: 36688431
Change-Id: I7286958345d1762d4a93176afe300d1e4d168f6d
2017-03-28 20:24:12 -07:00
Stephen Chen
7495b52960 Merge "Do not disable toggle when Wi-Fi is enabling and disabling." into oc-dev am: d40ea0a963
am: 530c6dbbd8

Change-Id: I61ddb29ecd2ad5d2cb40ab8e780fe81f115731e1
2017-03-29 02:26:57 +00:00
Stephen Chen
530c6dbbd8 Merge "Do not disable toggle when Wi-Fi is enabling and disabling." into oc-dev
am: d40ea0a963

Change-Id: Ie2b6385a47b7f6064e453ae09a5155d0ed16329f
2017-03-29 02:24:27 +00:00
TreeHugger Robot
d40ea0a963 Merge "Do not disable toggle when Wi-Fi is enabling and disabling." into oc-dev 2017-03-29 02:20:10 +00:00
Maurice Lam
c48f29f038 Merge "Add DEFERRED_SETUP as exclusive suggestion" 2017-03-29 01:25:22 +00:00
TreeHugger Robot
c220e671ad Merge "Increase the char limit for the bluetooth tethering strings." 2017-03-29 01:16:52 +00:00
jackqdyulei
3bbaca9c7c Add summary for categories in battery advanced page
If the category only contains one app, show usage time, otherwise
show app with maximum usage.

Also add usage time for apps in battery settings page.

Bug: 35396770
Test: RunSettingsRoboTests
Change-Id: I43fe9c2289535be2c1b95ffded6b52b0ff099589
2017-03-28 17:54:49 -07:00
Stephen Chen
a82c048e12 Do not disable toggle when Wi-Fi is enabling and disabling.
The toggle disabling of Wi-Fi in its ENABLING and DISABLING states
are not in sync with the loading of access points, and so removed
the disabling entirely.

Bug:34287227
Test: manual inspection.
Change-Id: Ibcb401eaaa34be79e1e73a947b2ea845cca79996
2017-03-28 17:20:41 -07:00
jackqdyulei
82d07983b4 Create Controller for app buttons
These two buttons(uninstall + forcestop) are used in both battery page
and app page, we should move the logic for these two buttons into one
place.

This cl creates the AppButtonsPreferenceController for the above
purpose. This cl only copies the logic to controller but hasn't make
InstalledAppDetails use this controller.

Since DialogFragment could not use function in controller directly,
the controller expose DialogListener and all the fragments must
implement this interface. Then they can delegate the method call
to controller directly.

The following cl will:
1. Make the InstalledAppDetails be compatible to controller
2. Make the InstalledAppDetails use this controller.

Bug: 35810915
Test: RunSettingsRoboTests
Change-Id: Ie2aa8064bcec3003233896c18be772825b12930a
2017-03-28 17:05:19 -07:00
Yohei Yukawa
7a76a5ed37 Merge "Set flagForceAscii for device password entries" into oc-dev am: ef34273654
am: 6c4d4600e3

Change-Id: Ifd213e69ff9dce07da1ccdf93698051a3447cb02
2017-03-28 23:31:44 +00:00
Yohei Yukawa
6c4d4600e3 Merge "Set flagForceAscii for device password entries" into oc-dev
am: ef34273654

Change-Id: Id4334fbb8911a7d826c547004773e03ef90f69d1
2017-03-28 23:27:45 +00:00
TreeHugger Robot
ef34273654 Merge "Set flagForceAscii for device password entries" into oc-dev 2017-03-28 23:21:02 +00:00
TreeHugger Robot
9502f112e6 Merge "Use buttons for EncryptionInterstitial" 2017-03-28 23:11:41 +00:00
Amin Shaikh
281265280c Merge "Remove delayed processing of UI events in onStop" into oc-dev am: 0f1d2bb81c
am: c8238c7fb9

Change-Id: I5ff3050197f938bbea5a59ac5e4db9e875cfff85
2017-03-28 20:48:36 +00:00
Amin Shaikh
c8238c7fb9 Merge "Remove delayed processing of UI events in onStop" into oc-dev
am: 0f1d2bb81c

Change-Id: Ic5da1d4a885a827cc01e19e14ebe07f5b9408044
2017-03-28 20:43:36 +00:00
TreeHugger Robot
0f1d2bb81c Merge "Remove delayed processing of UI events in onStop" into oc-dev 2017-03-28 20:38:25 +00:00
Doris Ling
e3716b9be3 Revert "Convert BT preference to use TwoTargetPreference" am: 457c3cbec2
am: 6226a2b825

Change-Id: I3b3ab282b7f58c52baad57f3fa1fe51a090372ec
2017-03-28 20:21:52 +00:00
Doris Ling
6226a2b825 Revert "Convert BT preference to use TwoTargetPreference"
am: 457c3cbec2

Change-Id: I7c2bae70c0ec5d94dcf962ab98159ace751b7571
2017-03-28 20:14:03 +00:00
TreeHugger Robot
88cf569484 Merge "Add null check for the media player when surface texture is available." 2017-03-28 20:13:55 +00:00
Doris Ling
457c3cbec2 Revert "Convert BT preference to use TwoTargetPreference"
This reverts commit 09c7f15b12.

Change-Id: I29aa67f026c0b54da08b19657f9916275e5a3459
2017-03-28 20:03:10 +00:00
TreeHugger Robot
d86035b487 Merge "Hide Wifi and Systemui in settings main page" 2017-03-28 19:26:58 +00:00
TreeHugger Robot
e2e3098d67 Merge "OMADM Trigger in *#*#INFO#*#* hidden menu." 2017-03-28 19:14:18 +00:00
Amin Shaikh
5e0c60d2ac Remove delayed processing of UI events in onStop
Bug: 36682492
Test: manually; test tracking in b/36403635
Change-Id: Ia369cd61a6473ae2af4891cf6b923900504921c1
2017-03-28 19:13:23 +00:00
Doris Ling
7f3ce8e862 Add null check for the media player when surface texture is available. am: 6709b6d399
am: abae2cf608

Change-Id: I501c20a178959a9c3661351cc479e20511ca2d41
2017-03-28 19:03:29 +00:00