Commit Graph

12596 Commits

Author SHA1 Message Date
Daniel Nishi
b41f08ce10 Merge "Update the Storage icons." into oc-dr1-dev am: fa47cebd55
am: 5f27569478

Change-Id: Ibd5bf197507154c7c45b875ab46350c70b6f3ee8
2017-07-06 22:30:55 +00:00
TreeHugger Robot
e663befae4 Merge "App header cleanup" 2017-07-06 22:22:52 +00:00
Daniel Nishi
5f27569478 Merge "Update the Storage icons." into oc-dr1-dev
am: fa47cebd55

Change-Id: I2a393ea0aa4274c23cf9c75fdc655d7436d695d3
2017-07-06 22:10:18 +00:00
Daniel Nishi
fa47cebd55 Merge "Update the Storage icons." into oc-dr1-dev 2017-07-06 21:50:49 +00:00
Fan Zhang
75bee9bf98 App header cleanup
- Refactor the entity header layout to use LinearLayout and add id to
  content area
- Remove now unused AppHeader class
- Make entire icon+text area clickable and link to app info page
  Refactor the binding logic from bindButton to its own method.
- Remove unused MultiLinePreference

Fix: 62705377
Test: make RunSettingsRoboTests

Change-Id: I6db554695410e71b669f6fdba29d98fedc3364b9
2017-07-06 13:23:38 -07:00
Rajeev Kumar
88f5dd165d 1. Fix the apostrophe escaping for few strings in Settings app
2. Fix few indentation issues in strings.xml file

Test: Manually tested it.
Change-Id: I8f3e7c213614c26fc835b646289ce7fd01d5b626
2017-07-06 12:32:11 -07:00
Lorenzo Colitti
ad25a47e92 Merge "Add a developer offload for tethering hardware acceleration." into oc-dr1-dev am: dcc15eabdf
am: 413d0ac41e

Change-Id: I1521f1a914b7d8514d9eb976f56d5b856caa2a83
2017-07-06 06:36:46 +00:00
Lorenzo Colitti
413d0ac41e Merge "Add a developer offload for tethering hardware acceleration." into oc-dr1-dev
am: dcc15eabdf

Change-Id: I28e2de31fafa533e35655a2d5f2ec9b1e3554eee
2017-07-06 06:30:31 +00:00
TreeHugger Robot
dcc15eabdf Merge "Add a developer offload for tethering hardware acceleration." into oc-dr1-dev 2017-07-06 06:13:55 +00:00
Daniel Sheng
89efcf0c0b Removed camera lift gesture settings UI.
am: 9a16e473ab

Change-Id: I7fe06ff066878b725be5a8ac6132ee9fa9ff3a81
2017-07-06 05:39:34 +00:00
Daniel Sheng
34887c8355 Merge "Added suggestions for gestures." into oc-dr1-dev
am: f8e0963f78

Change-Id: If48fd6cbbc1e8a90afd12da39df8752c4ff301f4
2017-07-06 03:30:33 +00:00
Daniel Sheng
9a16e473ab Removed camera lift gesture settings UI.
Bug: 37154489
Test: make + manual + unit tests
Change-Id: Ifefa07d0e8e0de19d78303352c6f0e01dc1c52ab
Merged-In: I79e70dea12a65fefcb06aca3fd1891a95d856626
2017-07-05 20:24:12 -07:00
Daniel Sheng
f8e0963f78 Merge "Added suggestions for gestures." into oc-dr1-dev 2017-07-06 03:19:57 +00:00
Lorenzo Colitti
03c4a7401e Add a developer offload for tethering hardware acceleration.
Bug: 32163131
Test: builds
Change-Id: Icca7bbd2bdd572b1328e7d0fecb663405b115fe1
2017-07-06 12:13:11 +09:00
Daniel Sheng
11d240c300 Removed camera lift gesture settings UI.
Bug: 37154489
Test: make + manual + unit tests
Change-Id: I79e70dea12a65fefcb06aca3fd1891a95d856626
2017-07-05 18:04:10 -07:00
Daniel Sheng
f7c459c9e5 Added suggestions for gestures.
Bug: 30986021
Test: manual + make RunSettingsRoboTests + adb shell am instrument -w
com.android.settings.tests.unit /android.support.test.runner.AndroidJUnitRunner
Change-Id: I7337a141cb21e5a1399aaca05ec1facd8629577b
Merged-In: I7aed110c81ca2fb6b90e2f359b4bb941c02bc1c3
2017-07-05 17:35:03 -07:00
Daniel Sheng
77ba611ac0 Merge "Added suggestions for gestures." 2017-07-06 00:34:06 +00:00
Android Build Merger (Role)
e9e5978576 Merge "Merge "Fix Bluetooth device details crash on screen rotation" into oc-dr1-dev am: 6d50576496 am: 5438319677" 2017-07-05 23:21:57 +00:00
TreeHugger Robot
e0f8691abf Merge "Fix alignment for build number preference in RTL." 2017-07-05 23:21:44 +00:00
Antony Sargent
c73c4b4055 Merge "Fix Bluetooth device details crash on screen rotation" into oc-dr1-dev am: 6d50576496
am: 5438319677

Change-Id: I1595e3c80b731a4c7f86faa198f2cc6e7f05d710
2017-07-05 23:15:53 +00:00
Antony Sargent
5438319677 Merge "Fix Bluetooth device details crash on screen rotation" into oc-dr1-dev
am: 6d50576496

Change-Id: Ib35f0e2f74055b7c119f9fd9775c7299a6cc9e29
2017-07-05 22:55:51 +00:00
Antony Sargent
6d50576496 Merge "Fix Bluetooth device details crash on screen rotation" into oc-dr1-dev 2017-07-05 22:49:04 +00:00
Sundeep Ghuman
2d1e8a736e Merge "Use EntityHeaderController in WifiDetailPreferenceController." into oc-dr1-dev am: 09229abbf2
am: 4fd8528c2f

Change-Id: Ie183a68e7ae944bad8a2ca3782522afd7f78b74f
2017-07-05 22:43:16 +00:00
Sundeep Ghuman
4fd8528c2f Merge "Use EntityHeaderController in WifiDetailPreferenceController." into oc-dr1-dev
am: 09229abbf2

Change-Id: I7a636c40515b24b7376b8ceadf969a257b2dc8d9
2017-07-05 22:30:22 +00:00
TreeHugger Robot
09229abbf2 Merge "Use EntityHeaderController in WifiDetailPreferenceController." into oc-dr1-dev 2017-07-05 22:21:40 +00:00
Daniel Nishi
2872e2c6cc Update the Storage icons.
Change-Id: I10648df80566629c09d03211ed642516595e4b22
Fixes: 62548249
Test: Manual
2017-07-05 14:41:12 -07:00
Fan Zhang
e6b7bc6f15 Fix alignment for build number preference in RTL.
- Fixed by adding BidiFormatter.unicodeWrap around the whole string.

Change-Id: I3ca1292d912062db8c2fead524cd84a19eb80cff
Fix: 63135900
Test: make RunSettingsRoboTests
2017-07-05 14:20:08 -07:00
TreeHugger Robot
ff45106b49 Merge "Adjust UX for toggles when active scorer is not set." 2017-07-05 21:19:58 +00:00
Daniel Nishi
ac4c095f3e Merge "Storage item preferences should be 72dp tall." into oc-dr1-dev am: 37caf9c7da
am: d7685ec8c8

Change-Id: I59838e687f360a2121ff24be805a9f5cb090f639
2017-07-05 20:44:22 +00:00
Daniel Nishi
d7685ec8c8 Merge "Storage item preferences should be 72dp tall." into oc-dr1-dev
am: 37caf9c7da

Change-Id: Ib2f37664e42035e72c0980ac3dc209e47585f95f
2017-07-05 20:42:29 +00:00
Daniel Nishi
37caf9c7da Merge "Storage item preferences should be 72dp tall." into oc-dr1-dev 2017-07-05 20:40:41 +00:00
jackqdyulei
2a6abb5e80 Merge "Make items in Advanced battery page unclickable." into oc-dr1-dev am: 3a9734261d
am: 593049c1d4

Change-Id: Idbdaad128672c06837730863ad2d71446b4642fa
2017-07-05 20:27:29 +00:00
jackqdyulei
593049c1d4 Merge "Make items in Advanced battery page unclickable." into oc-dr1-dev
am: 3a9734261d

Change-Id: I03c108b9a4712205906125ea12114e4ed6659255
2017-07-05 20:24:58 +00:00
TreeHugger Robot
3a9734261d Merge "Make items in Advanced battery page unclickable." into oc-dr1-dev 2017-07-05 20:21:46 +00:00
Sundeep Ghuman
d569195299 Use EntityHeaderController in WifiDetailPreferenceController.
Switch to the Entity header to bring parity in design of
WifiNetworkDetailsFragment and other Settings pages.

Bug: b/37252029
Test: make -j40 RunSettingsRoboTests
Change-Id: Ib11f3d37eac4dca08fa61eef67910cd328682bac
2017-07-05 12:54:38 -07:00
Stephen Chen
7e27006a7b Adjust UX for toggles when active scorer is not set.
This change fixes two issues: when wakeup is not available, update the
number of items to show above the fold in wifi preferences. When scorer
is not set, grey out wakeup toggle and set summary to reflect the
status.

Bug: 62410973
Bug: 62343859
Test: make RunSettingsRoboTests -j40

Change-Id: I5f4131c6a86eab6c0fb03ea2b5101ba107a9189f
2017-07-05 12:29:06 -07:00
Daniel Sheng
20d5588a27 Added suggestions for gestures.
Bug: 30986021
Test: manual + make RunSettingsRoboTests + adb shell am instrument -w
com.android.settings.tests.unit /android.support.test.runner.AndroidJUnitRunner

Change-Id: I7aed110c81ca2fb6b90e2f359b4bb941c02bc1c3
2017-07-05 09:05:11 -07:00
TreeHugger Robot
aaeb09e6c7 Merge "Import translations. DO NOT MERGE" into oc-dr1-dev 2017-07-01 16:06:05 +00:00
Bill Yi
7df73c0524 Import translations. DO NOT MERGE
Change-Id: I67181f9f767d7edccf78f901ad70e903b123649f
Auto-generated-cl: translation import
2017-06-30 18:02:00 -07:00
Fan Zhang
63b43c082d Change permission preference to only 1 line summary am: 32a8568230
am: 33a91c5004

Change-Id: I2e32fe198008b05a779dbfc68fc5695fec10f8bb
2017-07-01 00:49:43 +00:00
Fan Zhang
33a91c5004 Change permission preference to only 1 line summary
am: 32a8568230

Change-Id: I5f4cb35694767adc62d5f094e481d1423a85c93b
2017-07-01 00:45:13 +00:00
Antony Sargent
1b6e7d76ed Fix Bluetooth device details crash on screen rotation
We were getting the following exception when you rotated the Bluetooth
device details screen:

java.lang.RuntimeException: Unable to start activity
ComponentInfo{com.android.settings/com.android.settings.SubSettings}:
java.lang.IllegalStateException: This Activity already has an action bar
supplied by the window decor. Do not request Window.FEATURE_ACTION_BAR
and set android:windowActionBar to false in your theme to use a Toolbar
instead.

It turns out that allowing EntityHeaderController to inflate the
settings_entity_header.xml view seems to cause this - if you instead
manually include a LayoutPreference and hand that to
EntityHeaderController, you don't have the problem.

The rotation failure couldn't be tested with Robolectric because our
version doesn't support using FragmentTestUtil.startFragment for
fragments which use PreferenceScreen's ("sorry, not yet
implemented"). So instead this includes an app test.

Bug: 62447414
Test: runtest --path=BluetoothDeviceDetailsRotationTest.java
Change-Id: I8d052d1f4ab6e2b0ca5c0e513ec366bdcc382d99
2017-06-30 16:34:40 -07:00
TreeHugger Robot
25faa52b34 Merge "Move the placeholder in Account detail page above Account sync." 2017-06-30 23:00:19 +00:00
Fan Zhang
32a8568230 Change permission preference to only 1 line summary
Test: visual
Change-Id: I0e397c096eac19d312c5632cd7f0a1856c199b96
Fix: 36413664
2017-06-30 22:29:27 +00:00
Daniel Nishi
e6e3752dbf Merge "Use normal layout for "Space Used" header." into oc-dr1-dev am: 7809c3d2f0
am: 0c48b5a29d

Change-Id: I5c8c53050506127697721c971ba18baca6e50487
2017-06-30 22:16:23 +00:00
Daniel Nishi
0c48b5a29d Merge "Use normal layout for "Space Used" header." into oc-dr1-dev
am: 7809c3d2f0

Change-Id: I8eddca071d602cedcdcdbd5f65f5dd5265a084a8
2017-06-30 22:05:33 +00:00
Daniel Nishi
7809c3d2f0 Merge "Use normal layout for "Space Used" header." into oc-dr1-dev 2017-06-30 21:54:38 +00:00
Doris Ling
7ca92571b2 Move the placeholder in Account detail page above Account sync.
Change-Id: I812551f3cccf3b107d2a2532170ef0ef3157bee1
Fix: 62364991
Test: visual
2017-06-30 13:44:24 -07:00
jackqdyulei
a66363a787 Make items in Advanced battery page unclickable.
Because these items only display info and have no click action:
1. foreground time item
2. background time item
3. battery usage item

Bug: 62423725
Test: Build
Change-Id: I8d15be13953c73fce4d5f42711e186673673a036
2017-06-30 11:11:16 -07:00
Lei Yu
6f19d968bf Merge "Update strings for anomaly dialog" into oc-dr1-dev am: 2354fae941
am: 34c96fff5c

Change-Id: I254eb9ccac2190030bc0f920c053f93570b6ef2b
2017-06-29 22:17:33 +00:00