Commit Graph

34358 Commits

Author SHA1 Message Date
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
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
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
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
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
Doris Ling
abae2cf608 Add null check for the media player when surface texture is available.
am: 6709b6d399

Change-Id: Ia22b9ea654ff19a7dbe36e6da6c285e542d3c151
2017-03-28 18:49:44 +00:00
Alex Salo
72ddf49b3d Merge "Changed the string describing location state "Device only" to be more precise and let users know that we are using device sensors in addition to the GPS." 2017-03-28 18:47:15 +00:00
Doris Ling
6d17af4d64 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
2017-03-28 11:41:36 -07:00
Doris Ling
6709b6d399 Add null check for the media player when surface texture is available.
- Call to MediaPlayer.create() method can return null, and hence we need
to check the return value before trying access the media player.

Change-Id: I4a5e0edbd6db21b678efb05ea733187f34185432
Fix: 36668356
Test: make RunSettingsRoboTests
2017-03-28 18:28:44 +00:00
Doris Ling
82d6e96b7f Add null check for the media player when surface texture is available.
- Call to MediaPlayer.create() method can return null, and hence we need
to check the return value before trying access the media player.

Change-Id: I4a5e0edbd6db21b678efb05ea733187f34185432
Fix: 36668356
Test: make RunSettingsRoboTests
2017-03-28 11:14:34 -07:00
Youhan Wang
fd781e91d4 OMADM Trigger in *#*#INFO#*#* hidden menu.
Test: make

Bug:32874442
Change-Id: Ie64eb28671ec4afafd352d1f86b61c4ce1108338
2017-03-28 11:01:26 -07:00
Doris Ling
29d4f1f4a0 Merge "Fix null pointer on dismissing suggestion." 2017-03-28 17:55:12 +00:00
Doris Ling
ae53f97650 Fix null pointer on dismissing suggestion.
Add null check for context when getting the suggestion identifier, since
this is called from async task and context might becomes null.

Change-Id: If17036803de1634891b659a4fc6bd4b8a76ef5fb
Fix: 36605386
Test: make RunSettingsRoboTests
2017-03-28 17:53:52 +00:00
jackqdyulei
1e95b74f77 Hide Wifi and Systemui in settings main page
Also move the systemui to category system

Fix: 36644740
Fix: 36645264
Test: RunSettingsRoboTests

Change-Id: I6b64a7dca58091f3a1d8b7d99c8bae7ddf9169f9
2017-03-28 10:51:12 -07:00
Daniel Nishi
c5f93b9ba5 Merge "Re-add the option to migrate data back." 2017-03-28 17:00:55 +00:00
Amin Shaikh
3513b64024 Use Collator to sort saved networks. am: 32924e2f58
am: fe5d2ee936

Change-Id: I463189b11a896ed9790c4499a9387eee1600034d
2017-03-28 16:58:21 +00:00
Amin Shaikh
fe5d2ee936 Use Collator to sort saved networks.
am: 32924e2f58

Change-Id: I4a512a3e1424977d6f1085eb4a62f2ece19b61b7
2017-03-28 16:46:51 +00:00
Yohei Yukawa
e2a7bddbe1 Set flagForceAscii for device password entries
Since the beginning [1], ChooseLockPassword#validatePassword() has never
accepted non-ASCII characters [2].  Hence we can safely specify
EditorInfo#IME_FLAG_FORCE_ASCII so that IMEs can optimize their UX based
on this flag.  Note that EditorInfo#IME_FLAG_FORCE_ASCII is just a hint
for the IME so there should be no behavior change in the system side.

Note also that EditorInfo#IME_FLAG_FORCE_ASCII has been used in KeyGuard
(keyguard_password_view.xml) since JB MR-1 [3] so this flag is considered
to be well tested.

 [1]: 00d2476d8f
 [2]: Only character c where 32 <= c <= 126 is accepted
 [3]: Id75286113771ca1407e9db182172b580f870b612

Test: Run `adb shell dumpsys input_method` when the password entry
      field is focused to make sure that 'imeOptions' parameter
      has 0x80000000 bit. Tested the following scenarios:
       - PIN on a direct-boot disabled device
       - PIN on a direct-boot enabled device
       - Password on a direct-boot disabled device
       - Password on a direct-boot enabled device
Fixes: 27858858
Change-Id: I3075e24c6dac4d49f4d0e56a0d4d8434a323754d
2017-03-28 16:42:17 +00:00
Amin Shaikh
32924e2f58 Use Collator to sort saved networks.
Bug: 36570745
Test: m RunSettingsRoboTests && manually checking Saved networks
Change-Id: I58bfc07c8456746bba88bffdc9c6c7df8650e012
(cherry picked from commit 0c0fc19aef)
2017-03-28 16:40:20 +00:00
TreeHugger Robot
6e0d19ff18 Merge "Use Collator to sort saved networks." 2017-03-28 16:25:53 +00:00
tiansiming
40234f6fe2 Optimize code on get UidDetail in AppDataUsage
The class UidDetailProvider providers details about a specific UID,
we can directly  apply it here.

Optimize: https://code.google.com/p/android/issues/detail?id=237810
Test: for case TrafficStats.UID_REMOVED
1.add an new User
2.generate some data traffic under the new user
3.switch to the phone owner
4.delete the User added just now
5.go to Data usage and open the item "Removed apps and users"

    for case TrafficStats.UID_TETHERING
1.open tethering and generate some data traffic
2.go to Data usage and open the item "Tethering & portable hotspot"

Change-Id: I05aa522728b296d6c06580adf809f274491cdcea
Signed-off-by: tiansiming <tiansiming@xiaomi.com>
2017-03-28 22:13:53 +08:00
Noah Wang
474c291fa7 Adding help links to font size and display settings screens.
bug: 33110518
Change-Id: I5b75adc493ed0ab16a2dd653554af7a7c6e137ad
2017-03-28 02:01:26 -07:00
fen wang
c79681d88c Merge "Initialize LDAC to ABR mode" am: f80b445166 am: 8bed25af1f
am: 9660f0ee80

Change-Id: I4ff3e93ae7093deb94006c4ddf651045a1c0ad13
2017-03-28 05:19:49 +00:00
fen wang
9660f0ee80 Merge "Initialize LDAC to ABR mode" am: f80b445166
am: 8bed25af1f

Change-Id: Iab167bc1688e87ea0aeb44853dda3854d1601fc9
2017-03-28 05:11:38 +00:00
fen wang
8bed25af1f Merge "Initialize LDAC to ABR mode"
am: f80b445166

Change-Id: If89ff9a484b13a61e783c0eaf251e6fd9fbb6ea8
2017-03-28 05:03:43 +00:00