Fabrice Di Meglio
26d8c0e99e
Merge "Fix bug #16951566 Switchbar color needs to change to ff37474f" into lmp-dev
2014-08-11 18:20:32 +00:00
Fabrice Di Meglio
8da603f230
Fix bug #16951566 Switchbar color needs to change to ff37474f
...
- change the SwitchBar color as requested by UX
Change-Id: I3ca81e8ac0276fa9aab205f0045cd8b14855ddf7
2014-08-11 15:31:33 -07:00
Paul Lawrence
ccf49c0206
Merge "Fix UI to mocks" into lmp-dev
2014-08-11 18:20:32 +00:00
Paul Lawrence
4fd2e5f398
Fix UI to mocks
...
Bug: 16034329
Change-Id: I6746baeee3f49ad1df2524d690c870f49afedb48
2014-08-11 15:00:00 -07:00
Jim Miller
898671f141
Merge "Update SecuritySettings to use SwitchPreference" into lmp-dev
2014-08-11 18:14:57 +00:00
Jim Miller
4a9065e654
Update SecuritySettings to use SwitchPreference
...
Fixes bug 16900059
Change-Id: Ic3d498c3c4da32f1ba75559073957bb1087912f1
2014-08-11 16:35:41 -07:00
PauloftheWest
cccc5defd6
Merge "Added WiFi Assistant settings." into lmp-dev
2014-08-11 17:55:01 +00:00
PauloftheWest
d60f85daad
Added WiFi Assistant settings.
...
+ Added ability to setup Wifi Assistant.
- Removed 'Avoid poor connections' from WiFi Advance Settings.
- Removed 'Optimize Wi-Fi' from WiFi Advance Settings.
+ Replaced checkboxes with switches in WifFI Advance Settings.
+ Added horizontal rule to seperate MAC/IP address text.
Bug: 15698824
Change-Id: Ia319ff5fb2566854666a07d0e77c8816a49fd3d6
2014-08-12 11:27:38 -07:00
PauloftheWest
ad11a0f989
Revised Bluetooth discoverability string.
...
Bug: 16882911
Change-Id: I89ec10c42747079e9714ae618294d06997059159
2014-08-12 09:09:05 -07:00
Zoltan Szatmary-Ban
3acb88746a
am d58f0bd6: Merge "Increase CHAR_LIMIT on Device Admins Settings message" into lmp-dev
...
* commit 'd58f0bd64f1554a4c15b812bcd90fc52f00860b6':
Increase CHAR_LIMIT on Device Admins Settings message
2014-08-11 12:13:51 +00:00
Alexandra Gherghina
bad9e585dd
am ad54ba70: Merge "Show managed profile under accounts rather than users" into lmp-dev
...
* commit 'ad54ba7030be6654bd76b3ee1a001d388130bcac':
Show managed profile under accounts rather than users
2014-08-11 09:29:20 +00:00
Paul Lawrence
c44274917f
am f8811a59: Merge "Strings for next change" into lmp-dev
...
* commit 'f8811a59ffd4fa39997154681d753d3370697b83':
Strings for next change
2014-08-08 22:59:36 +00:00
Zoltan Szatmary-Ban
d58f0bd64f
Merge "Increase CHAR_LIMIT on Device Admins Settings message" into lmp-dev
2014-08-08 20:34:05 +00:00
Zoltan Szatmary-Ban
a1373770c1
Increase CHAR_LIMIT on Device Admins Settings message
...
Increased CHAR_LIMIT to 120 on @string/managed_profile_device_admin_info to
accomodate translation.
Bug:16838113
Change-Id: I111ed73d6ff546387c4a2b5df5f4edf8a3932be7
2014-08-11 11:50:39 +01:00
Alexandra Gherghina
ad54ba7030
Merge "Show managed profile under accounts rather than users" into lmp-dev
2014-08-08 20:34:05 +00:00
Alexandra Gherghina
83adb564de
Show managed profile under accounts rather than users
...
Also fixes overflow menu to update on remove/add managed profile.
Bug: 16234745
Bug: 16727076
Change-Id: I3283a8fa0096edfce5aad633e09ba3eed6d2174c
2014-08-11 10:02:13 +01:00
Fabrice Di Meglio
7aa645e498
am 07fd3469: Merge "Fix Wi-Fi Assistant padding" into lmp-dev
...
* commit '07fd346996c61c47e1dc13648cbbde3090a4b248':
Fix Wi-Fi Assistant padding
2014-08-08 20:02:19 +00:00
PauloftheWest
fc5a4085e1
am 14f60296: Merge "Fixed Bluetooth renaming bug." into lmp-dev
...
* commit '14f60296574316f94ca03fb82fc3675db373734e':
Fixed Bluetooth renaming bug.
2014-08-08 17:24:12 +00:00
Dan Sandler
f27ee3c6e2
am b5fca457: Merge "Fully deprecate Power Control widget." into lmp-dev
...
* commit 'b5fca45768d36552ce74785dfbc9d7da7ce67bea':
Fully deprecate Power Control widget.
2014-08-08 12:59:34 +00:00
Paul Lawrence
f8811a59ff
Merge "Strings for next change" into lmp-dev
2014-08-07 18:49:59 +00:00
Paul Lawrence
1d14e386af
Strings for next change
...
Next change is titled
Bring up factory reset UI when decryption fails but password is correct
Strings need to go in today to catch translation for L
Bug: 11477689
Change-Id: I84ddc2f88917ba9749fe4dc58fb00d4020cfe685
2014-08-08 15:10:18 -07:00
Fabrice Di Meglio
07fd346996
Merge "Fix Wi-Fi Assistant padding" into lmp-dev
2014-08-07 18:49:59 +00:00
Fabrice Di Meglio
bbed3dfdfd
Fix Wi-Fi Assistant padding
...
- use the standard list padding instead of a custom one
See bug: #15703202 Wi-Fi Assistant card needs to appear in Wi-Fi network list
Change-Id: I5816751bf7937807093e5b74b25b84151431fa7b
2014-08-08 12:56:51 -07:00
PauloftheWest
5380f196a2
am 689d2ce2: Changed a Bluetooth device\'s settings from an activity to a dialog.
...
* commit '689d2ce29b3093c32d1d2b70caa6fb36a4ecefcb':
Changed a Bluetooth device's settings from an activity to a dialog.
2014-08-07 18:40:34 +00:00
Dan Sandler
b5fca45768
Merge "Fully deprecate Power Control widget." into lmp-dev
2014-08-07 18:39:40 +00:00
PauloftheWest
689d2ce29b
Changed a Bluetooth device's settings from an activity to a dialog.
...
+ Replace the “Paired bluetooth device” screen with a “Pair device” dialog
+ Add device name text field at the top
+ Replace “Unpair” list item with a “Forget" button at bottom of dialog
+ Change “Profiles” section header to “Use for”
+ Remove status under profile titles
+ Move checkboxes to left side of labels
Bug: 15719219
Change-Id: I3b0e8c82c761fae98f16508b9fd9c58aff651f80
2014-08-07 11:31:25 -07:00
PauloftheWest
ed7b44d83d
Fixed Bluetooth renaming bug.
...
+ After renaming your Bluetooth device, the title of the Bluetooth
Activity stays "Bluetooth" instead of changing to the new name.
+ After renaming the device, the status at the bottom Bluetooth Settings
is correctly displayed.
Bug: 16463239
Change-Id: Ifb12df2004fe1f89bd6f918e23c2c64ae08a0191
2014-08-08 09:34:15 -07:00
Dan Sandler
d12748d635
Fully deprecate Power Control widget.
...
Its behavior is obviated by quick settings and battery
saver, and so should not be shipped on any new builds by
default.
Bug: 8415180
Change-Id: Ic941a1e536c0b37c6be62fed876bfa23e34dc84b
2014-08-07 12:59:11 -04:00
Sander Alewijnse
6173fed5a9
am 6a39bc68: Merge "Prevent launcher switching in Settings app." into lmp-dev
...
* commit '6a39bc68aea91483804d2ab8635159803208095d':
Prevent launcher switching in Settings app.
2014-08-07 11:57:49 +00:00
Fabrice Di Meglio
6d327ca8d1
am fa8950be: Merge "Fix bug #16800261 Settings app: Device administrator screen padding issue" into lmp-dev
...
* commit 'fa8950be33c777d0305775ee3a364300d454f91b':
Fix bug #16800261 Settings app: Device administrator screen padding issue
2014-08-06 19:07:31 +00:00
Dan Sandler
0ed917098e
am 4bdf8b49: Merge "Replace missing resource." into lmp-dev
...
* commit '4bdf8b498bf588f42368faf822f757fcd97a7959':
Replace missing resource.
2014-08-06 18:01:41 +00:00
Fabrice Di Meglio
911a54df7d
am bce84e79: Merge "Fix bug #16712121 Add \'Experimental\' substring to \'High contrast text\'" into lmp-dev
...
* commit 'bce84e798bbfbb9fd576cb785d90bf69cb3843e0':
Fix bug #16712121 Add 'Experimental' substring to 'High contrast text'
2014-08-06 18:01:40 +00:00
Fabrice Di Meglio
fa8950be33
Merge "Fix bug #16800261 Settings app: Device administrator screen padding issue" into lmp-dev
2014-08-06 17:19:40 +00:00
Fabrice Di Meglio
06601e149e
Fix bug #16800261 Settings app: Device administrator screen padding issue
...
- remove listPreferredItemPaddingStart / listPreferredItemPaddingEnd from
the ListView and add it to the list item
- add missing 8dp end padding for the icon
Change-Id: I78696e5ee8e243771d23c86fa178de2f60b5c88d
2014-08-06 11:25:39 -07:00
Fabrice Di Meglio
bce84e798b
Merge "Fix bug #16712121 Add 'Experimental' substring to 'High contrast text'" into lmp-dev
2014-08-06 17:19:40 +00:00
Fabrice Di Meglio
df77106e94
Fix bug #16712121 Add 'Experimental' substring to 'High contrast text'
...
- add "(Experimental)" as a summary text for "High contrast text"
Change-Id: I6faf1ea382e90a4f0dffcc8a093e4aa5a4653d23
2014-08-06 10:55:39 -07:00
Dianne Hackborn
b8e0e338c4
am dc77335e: Merge "Fix issue #16537318 : clarify voice interaction strings." into lmp-dev
...
* commit 'dc77335eda0edee8e8a72d04155aacad91ddc12c':
Fix issue #16537318 : clarify voice interaction strings.
2014-08-06 01:13:15 +00:00
Adrian Roos
774b4a626a
am 1f4049ed: Merge "Ask about redacted notifications after setting up a secure lock" into lmp-dev
...
* commit '1f4049edfe1937ce19c7d93a5576ea03db83ad50':
Ask about redacted notifications after setting up a secure lock
2014-08-05 19:12:22 +00:00
John Spurlock
511cdef85d
am 802ddf99: Settings: New application-level notification settings.
...
* commit '802ddf99f57e316d0fd87c2cfeed5dc3a0cfa8fe':
Settings: New application-level notification settings.
2014-08-05 15:13:07 +00:00
John Spurlock
802ddf99f5
Settings: New application-level notification settings.
...
- Convert the old application-level dialog to an activity.
- Move the settings icon to the new activity (out of the list).
- Add a custom application header, similar to the switch bar style.
- Use the ubiquitous vector gear for the settings icon.
- Migrate old checkboxes to switch prefs, add new summaries.
- Remove obsolete artifacts.
Bug:16396715
Change-Id: I857e3cf448b79f44fe1c242e6020f5214434c00c
2014-08-05 11:08:03 -04:00
Adrian Roos
1f4049edfe
Merge "Ask about redacted notifications after setting up a secure lock" into lmp-dev
2014-08-05 00:35:13 +00:00
Adrian Roos
6f60f7ed22
Ask about redacted notifications after setting up a secure lock
...
Bug: 14437890
Change-Id: I54cf355242375e8c7968c7d27c441fbd0a54cef2
2014-08-05 20:54:47 +02:00
Dan Sandler
4bdf8b498b
Merge "Replace missing resource." into lmp-dev
2014-08-05 00:35:13 +00:00
Dan Sandler
a15e76d113
Replace missing resource.
...
Bug: 16833578
Change-Id: I9ad1dc992577f6bfdc9d1201b6c13591a32f3fc8
2014-08-06 13:53:25 -04:00
Geoff Mendal
f3dfd182e1
Merge "Import translations. DO NOT MERGE" into lmp-dev
2014-08-05 00:34:22 +00:00
Geoff Mendal
c47db9c9fa
Import translations. DO NOT MERGE
...
Change-Id: If24e248354ae999208643fb8f91b0c0a9e7de233
Auto-generated-cl: translation import
2014-08-04 17:35:58 -07:00
Sander Alewijnse
6a39bc68ae
Merge "Prevent launcher switching in Settings app." into lmp-dev
2014-08-05 00:19:02 +00:00
Sander Alewijnse
cd40220372
Prevent launcher switching in Settings app.
...
User won't be able to switch to launchers that do not support
managed profiles.
Additional explanation is shown in text under the name of the
launcher.
Bug:15099904
Change-Id: I12470bf396d41ef47d463ef42835964aacda9719
2014-08-07 12:48:22 +01:00
Geoff Mendal
a0b87a2436
Merge "Import translations. DO NOT MERGE" into lmp-dev
2014-08-05 00:29:22 +00:00
Geoff Mendal
8e89e6d644
Import translations. DO NOT MERGE
...
Change-Id: I9d45348a4c9fab36e1c23ddf01b3c5c2cb535f56
Auto-generated-cl: translation import
2014-08-06 12:23:02 -07:00