Commit Graph

14695 Commits

Author SHA1 Message Date
PauloftheWest
bb60518aec am fc0c3b43: Merge "Set new PBAP connections to always allow." into lmp-dev
* commit 'fc0c3b43dfe420ef29dfa4fc576ffc486bc2266a':
  Set new PBAP connections to always allow.
2014-07-30 18:25:01 +00:00
John Spurlock
a5638b0c87 am d117a96e: Merge "Settings: Fix ordering for interruptions alarm warning." into lmp-dev
* commit 'd117a96e00ab2df2d523e4a62825cf90851dc342':
  Settings: Fix ordering for interruptions alarm warning.
2014-07-30 16:38:45 +00:00
PauloftheWest
33c02c981b am 361d870e: Added ability for user to automatically accept/deny Bluetooth Phonebook Syncs
* commit '361d870e5415f8642cb106b4329d194673b4dd02':
  Added ability for user to automatically accept/deny Bluetooth Phonebook Syncs
2014-07-30 16:19:48 +00:00
PauloftheWest
fc0c3b43df Merge "Set new PBAP connections to always allow." into lmp-dev 2014-07-30 16:17:51 +00:00
PauloftheWest
46c70190d6 Set new PBAP connections to always allow.
Bug: 13886947
Change-Id: I6ec612b803433db90992f5e4d1bac26311d90a84
2014-07-30 11:18:36 -07:00
PauloftheWest
361d870e54 Added ability for user to automatically accept/deny Bluetooth Phonebook Syncs
Bug: 16040292
Change-Id: Ieeaa014052f53787cf7057578e0b2ac048dc6eb1
2014-07-30 08:39:46 -07:00
Alexandra Gherghina
2653fe3c0f am c8a1db19: Toggle between primary and managed profile in apps settings
* commit 'c8a1db191207e38b7ad0acdfd276651e4911e812':
  Toggle between primary and managed profile in apps settings
2014-07-30 12:58:32 +00:00
Alexandra Gherghina
c8a1db1912 Toggle between primary and managed profile in apps settings
This adds a spinner to the apps screen which can be used to toggle
between the Settings app in the primary and managed profile so that the user
can edit settings belonging to both profiles.

Bug: 16369104
Change-Id: I09a94c07597e6509de025dfbbe0e454ae3d9b0aa
2014-07-30 09:15:38 +00:00
Fabrice Di Meglio
4b3e46ea18 am 5c14856b: Merge "Fix bug #16306535 The arrows rotate in the opposite direction... of the direction implied by the iconography (clockwise)" into lmp-dev
* commit '5c14856ba2cafeb00080355f7613a702779ca530':
  Fix bug #16306535 The arrows rotate in the opposite direction... of the direction implied by the iconography (clockwise)
2014-07-30 01:10:20 +00:00
Fabrice Di Meglio
7bdfe7fb83 am 6d9a59f0: Merge "Fix bug #16660819 Switchbar text should be white not grey" into lmp-dev
* commit '6d9a59f02df1bb9fae5974c510cd3eedf90fa5ce':
  Fix bug #16660819 Switchbar text should be white not grey
2014-07-30 01:10:14 +00:00
Amith Yamasani
736ea0e8a8 am ba9643b9: Merge "Implement SET_PROFILE_OWNER intent" into lmp-dev
* commit 'ba9643b92c6fa481152f55b862442f609c1e7410':
  Implement SET_PROFILE_OWNER intent
2014-07-29 23:47:00 +00:00
Fabrice Di Meglio
04d3520a07 am 9ee40022: Merge "Make Battery History chart non selectable" into lmp-dev
* commit '9ee4002288cd2bc455a5def8316456fd74c2551c':
  Make Battery History chart non selectable
2014-07-29 23:40:30 +00:00
Fabrice Di Meglio
6662865efa am db7d2d16: Merge "Fix bug #16623129 Stability: Settings: NPE in RunningProcessesView... startServiceDetailsActivity(RunningProcessesView.java:394)" into lmp-dev
* commit 'db7d2d16b1b3a7fdad8657a57fdcf8801e72a2c4':
  Fix bug #16623129 Stability: Settings: NPE in RunningProcessesView... startServiceDetailsActivity(RunningProcessesView.java:394)
2014-07-29 23:26:04 +00:00
Fabrice Di Meglio
10fb470622 am 76307f52: Merge "Fix bug #16660405 Stability: ISE in Settings: Observer ... com.android.settings.SettingsPreferenceFragment@3c1d9ecb was not registered" into lmp-dev
* commit '76307f52d0cb097f832aec2a353ee31bfdff78a7':
  Fix bug #16660405 Stability: ISE in Settings: Observer ... com.android.settings.SettingsPreferenceFragment$1@3c1d9ecb was not registered
2014-07-29 23:13:41 +00:00
John Spurlock
d117a96e00 Merge "Settings: Fix ordering for interruptions alarm warning." into lmp-dev 2014-07-29 22:44:51 +00:00
John Spurlock
8ef00dfe4b Settings: Fix ordering for interruptions alarm warning.
And update the string to the latest.

Bug:16662819
Change-Id: I42b38ab4721180babfd816a34a1fb1c368546cca
2014-07-30 12:33:04 -04:00
Fabrice Di Meglio
9ee4002288 Merge "Make Battery History chart non selectable" into lmp-dev 2014-07-29 21:36:00 +00:00
Fabrice Di Meglio
4a70996465 Make Battery History chart non selectable
- ... because it should not be selectable

See bug: #13140648 Settings needs to support the new Quantum Paper theme

Change-Id: I625d1533991623f5c3897be15ccfa48fd0fc02f8
2014-07-29 16:29:00 -07:00
Fabrice Di Meglio
2153ef3858 Fix bug #16623129 Stability: Settings: NPE in RunningProcessesView...
startServiceDetailsActivity(RunningProcessesView.java:394)

- make the ListView header non selectable

Change-Id: Ic5e888a7d1d3d1df1bcb59f3027e4385d46ba5ca
2014-07-29 16:15:27 -07:00
Fabrice Di Meglio
7c435f6b44 Fix bug #16660405 Stability: ISE in Settings: Observer ...
com.android.settings.SettingsPreferenceFragment$1@3c1d9ecb was not registered

- use a monitor to control registering / unregistering

Change-Id: Id66dd698abf92643c97938e2091c3be38e6b78bd
2014-07-29 16:02:22 -07:00
Fabrice Di Meglio
76307f52d0 Merge "Fix bug #16660405 Stability: ISE in Settings: Observer ... com.android.settings.SettingsPreferenceFragment$1@3c1d9ecb was not registered" into lmp-dev 2014-07-29 21:36:00 +00:00
Svetoslav
e3de4ca04c am 01daaca5: Remove unnecessary code.
* commit '01daaca5475930e394295b06f5a46dc057b44b0f':
  Remove unnecessary code.
2014-07-29 20:24:01 +00:00
Svetoslav
01daaca547 Remove unnecessary code.
Change-Id: I4a81cd7f855bb075ab71f6c6c812288e3677c90a
2014-07-29 13:16:12 -07:00
Fabrice Di Meglio
c13c0bd5dd am d5ec63ad: Merge "Fix bug #16382239 "Searching for Printers" progress bar is not Material / Quantum" into lmp-dev
* commit 'd5ec63ad5166b2a6530c2958819a053cccf4ec79':
  Fix bug #16382239 "Searching for Printers" progress bar is not Material / Quantum
2014-07-29 17:24:31 +00:00
Jay Civelli
b3891f4487 am 09b5228a: New activity that asks users to confirm their pattern. DO NOT MERGE
* commit '09b5228ae56283ebcb69d1c295033c74ea868ae5':
  New activity that asks users to confirm their pattern. DO NOT MERGE
2014-07-29 17:02:48 +00:00
Jay Civelli
09b5228ae5 New activity that asks users to confirm their pattern. DO NOT MERGE
Adds an activity that prompts the user for their PIN/password/pattern.

cherry-pick from master b88e8577b9

Bug 16242766

Change-Id: I3468215a8ac522a06de6573c93a5f5a6dc72ee2d
2014-07-29 09:38:38 -07:00
Alexandra Gherghina
6d09e061ef am 4a45be2f: Merge "Move global sync settings dialogs to the right screen" into lmp-dev
* commit '4a45be2ff83e1b3b9bd52be523639d100311bec3':
  Move global sync settings dialogs to the right screen
2014-07-29 15:31:48 +00:00
Alexandra Gherghina
c7142442e6 am 9017d3fd: Update the resource name to the new ic_corp prefix one.
* commit '9017d3fdd607b8978299578721303b8140a64c22':
  Update the resource name to the new ic_corp prefix one.
2014-07-29 15:27:24 +00:00
Alexandra Gherghina
9017d3fdd6 Update the resource name to the new ic_corp prefix one.
Bug: 16369104
Change-Id: I0cd2188b0ac1806487678c568db068995a1e9142
2014-07-29 15:22:17 +00:00
Alexandra Gherghina
4b7e002b7d am a6145a65: Toggle between primary and managed profile in App notif settings
* commit 'a6145a656af1241fd771038715cf839a8fce76e1':
  Toggle between primary and managed profile in App notif settings
2014-07-29 13:24:25 +00:00
Alexandra Gherghina
a6145a656a Toggle between primary and managed profile in App notif settings
This adds a spinner to the app notifications screen which can be used to toggle
between the Settings app in the primary and managed profile so that the user
can edit settings belonging to both profiles.

Bug: 16369104
Change-Id: I31c2fb4c0bc318fb8fa5c152621a29fd0c4bb403
2014-07-29 14:08:24 +01:00
Zoltan Szatmary-Ban
46c8a9bf8e am 0598e6f6: Merge "Fix refresh issue of badged icons in Battery Settings" into lmp-dev
* commit '0598e6f6842ad08af1d8dbb31aa3ddd3df7e37ed':
  Fix refresh issue of badged icons in Battery Settings
2014-07-29 12:49:32 +00:00
Zoltan Szatmary-Ban
b77ef9bee2 am 74f34e49: Merge "Update Data Usage Settings for Enterprise" into lmp-dev
* commit '74f34e496fc460842aa558512de03187f5ad9b2c':
  Update Data Usage Settings for Enterprise
2014-07-29 12:49:27 +00:00
Alexandra Gherghina
0d78165af6 am 11b8bda9: Refactors listening logic in AccountSettings
* commit '11b8bda93cf3acf3b699eeb479a99e09682a369d':
  Refactors listening logic in AccountSettings
2014-07-29 12:49:26 +00:00
Alexandra Gherghina
76cc239fba am fe47a8dc: Toggle between primary and managed profile in Print Settings
* commit 'fe47a8dc89fe0393dae16b1c2152c901feab4dcb':
  Toggle between primary and managed profile in Print Settings
2014-07-29 12:49:25 +00:00
Alexandra Gherghina
11b8bda93c Refactors listening logic in AccountSettings
This is required to make sure that we do not leak broadcast receivers.
No user-visible changes are present.

Bug: 15466880
Change-Id: I90fcf9f8281a786948d862f48a3d7e7ac2bbe6ba
2014-07-29 11:19:15 +01:00
Alexandra Gherghina
fe47a8dc89 Toggle between primary and managed profile in Print Settings
This adds a spinner to the print settings screen which can be used to toggle
between the Settings app in the primary and managed profile so that the user
can edit settings belonging to both profiles.

Bug: 16369104
Change-Id: I2556a331d09379c2a501bc6b192ab1631b5215f5
2014-07-29 10:22:15 +01:00
John Spurlock
a758ad9746 am b8ec3434: Settings: Carve out app-level notifcation settings dialog.
* commit 'b8ec34346495245043933ac0f1b78781ae5054db':
  Settings: Carve out app-level notifcation settings dialog.
2014-07-29 02:15:24 +00:00
John Spurlock
b8ec343464 Settings: Carve out app-level notifcation settings dialog.
Bug:16208321
Change-Id: I46574618518e8fe4cbef70e80204cc7bb7cb76e9
2014-07-28 22:10:46 -04:00
Fabrice Di Meglio
17aff4af2c am 3a166613: Merge "Fix bug #16384201 Security > "Device administrators" layout is wrong on N10 (tablet UI)" into lmp-dev
* commit '3a166613becfb8de08939616d2dd6d28c180a130':
  Fix bug #16384201 Security > "Device administrators" layout is wrong on N10 (tablet UI)
2014-07-29 02:04:05 +00:00
Fabrice Di Meglio
06db26bde9 am 54bac5f2: Merge "Fix App Info padding" into lmp-dev
* commit '54bac5f2c6e58fca8d1aa5cb4f5ed053a3559c02':
  Fix App Info padding
2014-07-29 01:35:46 +00:00
Fabrice Di Meglio
bbd076c1f3 am 173e3161: Merge "Some code formatting" into lmp-dev
* commit '173e31619a34436e8cb100fb30f0e3477b7edf8e':
  Some code formatting
2014-07-29 01:03:58 +00:00
Maurice Lam
45ca3fedea am 569aec7b: [WifiSetup] Fix auto-finish suppression logic
* commit '569aec7b4d6cc9e5268a059d9f18f271afadb706':
  [WifiSetup] Fix auto-finish suppression logic
2014-07-29 00:47:59 +00:00
Alan Viverette
6c27489f40 am 744c6b22: Remove TimePicker and DatePicker dialog themes
* commit '744c6b22513f3b51f035b2038a59d35c97c4da6c':
  Remove TimePicker and DatePicker dialog themes
2014-07-29 00:47:58 +00:00
Maurice Lam
569aec7b4d [WifiSetup] Fix auto-finish suppression logic
The flag needs to be saved into the instance state, and the flag is
set as soon as auto-finish occurs to avoid multi-launching the next
activity.

Bug: 16561238
Change-Id: I954b7ff77b2d2fc35684ea59cca7d7cd588a6aab
2014-07-29 00:07:38 +00:00
Alan Viverette
744c6b2251 Remove TimePicker and DatePicker dialog themes
Also moves TimePicker widget style to appropriate XML file / namespace.

BUG: 14973897
Change-Id: I0eb68a59d8f2800d37cc949c948689d47c34486f
2014-07-29 00:06:20 +00:00
Baligh Uddin
ed62a1ab26 am c4108655: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit 'c4108655e114631cf71b4f505357936e53469fe4':
  Import translations. DO NOT MERGE
2014-07-28 23:15:48 +00:00
Fabrice Di Meglio
90bfe0cf7e am d197608e: Merge "Fix bug #14323097 Launching Security from Settings search results ...show header as Settings instead of Security" into lmp-dev
* commit 'd197608e8340765e736c234dabffae8d3dc695e1':
  Fix bug #14323097 Launching Security from Settings search results ...show header as Settings instead of Security
2014-07-28 23:15:47 +00:00
Fabrice Di Meglio
3a166613be Merge "Fix bug #16384201 Security > "Device administrators" layout is wrong on N10 (tablet UI)" into lmp-dev 2014-07-28 22:45:16 +00:00
Fabrice Di Meglio
402c4515db Fix bug #16384201 Security > "Device administrators" layout is wrong on N10 (tablet UI)
- add correct padding

Change-Id: I08a34839f94e899469b429dd83e301c5418155f5
2014-07-28 18:55:29 -07:00