PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
15,084 Commits 1 Branch 0 Tags
55e5d2a844831db9bf7c55a58556f2a2acfce436
Commit Graph

15084 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Geoff Mendal
55e5d2a844 am 6dd54c30: (-s ours) am c8f7dff0: (-s ours) am 86bf735a: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit '6dd54c30cedf113d148e660876676327dada6718':
  Import translations. DO NOT MERGE
 2014-07-31 01:57:08 +00:00
Geoff Mendal
6dd54c30ce am c8f7dff0: (-s ours) am 86bf735a: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit 'c8f7dff0bb14a4af78f33999b00bf25577b86657':
  Import translations. DO NOT MERGE
 2014-07-31 01:52:48 +00:00
Geoff Mendal
c8f7dff0bb am 86bf735a: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit '86bf735aae6714225a4c12bb032efebebbbfca84':
  Import translations. DO NOT MERGE
 2014-07-31 01:49:18 +00:00
Geoff Mendal
767cf5313f Merge "Import translations. DO NOT MERGE" 2014-07-30 23:34:26 +00:00
Geoff Mendal
179544d151 Import translations. DO NOT MERGE 
Change-Id: I7a8d40cfecee4835e65e0366a8cfe0f05a3dace2
Auto-generated-cl: translation import
 2014-07-30 18:41:18 -07:00
PauloftheWest
4c8e1c3c7e am fceeab3c: am 52d98cac: am d94e78b4: Merge "Fixed crash when changing orientation in the Add Networks dialog." into lmp-dev 
* commit 'fceeab3cb0f7e1712e730d403d1f64183177d55f':
  Fixed crash when changing orientation in the Add Networks dialog.
 2014-07-30 22:36:14 +00:00
PauloftheWest
fceeab3cb0 am 52d98cac: am d94e78b4: Merge "Fixed crash when changing orientation in the Add Networks dialog." into lmp-dev 
* commit '52d98cac7f26b62cff73c52d0fa11fdf21a4b0d3':
  Fixed crash when changing orientation in the Add Networks dialog.
 2014-07-30 22:32:36 +00:00
PauloftheWest
52d98cac7f am d94e78b4: Merge "Fixed crash when changing orientation in the Add Networks dialog." into lmp-dev 
* commit 'd94e78b4b2434259abb72563ee431b8312210ce0':
  Fixed crash when changing orientation in the Add Networks dialog.
 2014-07-30 22:26:36 +00:00
Julia Reynolds
4f058529f8 am 195d8251: am c39fcc87: am a71d7056: Merge "Fix issue with pin prompt." into lmp-dev 
* commit '195d8251056fbaeac7ad2abceea692ade4f38790':
  Fix issue with pin prompt.
 2014-07-30 21:03:36 +00:00
Julia Reynolds
195d825105 am c39fcc87: am a71d7056: Merge "Fix issue with pin prompt." into lmp-dev 
* commit 'c39fcc87a7970f371d7afce3ed9ff6bffd258fb7':
  Fix issue with pin prompt.
 2014-07-30 20:59:15 +00:00
Julia Reynolds
c39fcc87a7 am a71d7056: Merge "Fix issue with pin prompt." into lmp-dev 
* commit 'a71d7056503121fea26ce58fa8996871b4b10d25':
  Fix issue with pin prompt.
 2014-07-30 20:54:56 +00:00
Christoph Studer
0bf30e0e58 am 11722ee0: am 54aff114: am fe1b8950: Update NotificationStation after NotificationListenerService API change 
* commit '11722ee0115bdb02f4217b77c0793b809dd80c03':
  Update NotificationStation after NotificationListenerService API change
 2014-07-30 19:45:04 +00:00
Christoph Studer
11722ee011 am 54aff114: am fe1b8950: Update NotificationStation after NotificationListenerService API change 
* commit '54aff114bf013f2939a4ce61da598202efb2bf78':
  Update NotificationStation after NotificationListenerService API change
 2014-07-30 19:41:39 +00:00
Christoph Studer
54aff114bf am fe1b8950: Update NotificationStation after NotificationListenerService API change 
* commit 'fe1b8950bc02d96f2675505ee0aa95146831465b':
  Update NotificationStation after NotificationListenerService API change
 2014-07-30 19:36:46 +00:00
Christoph Studer
fe1b8950bc Update NotificationStation after NotificationListenerService API change 
Change-Id: Ia58c18657c44c0dd49b058ce5b581554889b08d5
 2014-07-30 19:32:54 +00:00
Geoff Mendal
86bf735aae Merge "Import translations. DO NOT MERGE" into lmp-dev 2014-07-30 19:31:16 +00:00
Geoff Mendal
a7a08fd726 Import translations. DO NOT MERGE 
Change-Id: I1b93e4357544ff5ce9bf18351ed34009ba06c5f5
Auto-generated-cl: translation import
 2014-07-30 18:31:14 -07:00
PauloftheWest
d94e78b4b2 Merge "Fixed crash when changing orientation in the Add Networks dialog." into lmp-dev 2014-07-30 19:31:16 +00:00
PauloftheWest
fd19aff782 Fixed crash when changing orientation in the Add Networks dialog. 
Bug: 16479540
Change-Id: Ib42977b72039f49b5d5ae688c0b0ded1094b44e2
 2014-07-30 15:16:38 -07:00
Elliott Hughes
6f88971602 am 1d739f1e: am 6d5c0e41: am 3ded7ddb: Merge "Work around an icu4c bug in TimeZoneNames::getDisplayName." into lmp-dev 
* commit '1d739f1e9f5eb8bfce1deb8375bf967dc9e8d862':
  Work around an icu4c bug in TimeZoneNames::getDisplayName.
 2014-07-30 19:06:11 +00:00
Elliott Hughes
1d739f1e9f am 6d5c0e41: am 3ded7ddb: Merge "Work around an icu4c bug in TimeZoneNames::getDisplayName." into lmp-dev 
* commit '6d5c0e411ca35cbdc80cc443e5c6794592c82444':
  Work around an icu4c bug in TimeZoneNames::getDisplayName.
 2014-07-30 19:02:06 +00:00
Elliott Hughes
6d5c0e411c am 3ded7ddb: Merge "Work around an icu4c bug in TimeZoneNames::getDisplayName." into lmp-dev 
* commit '3ded7ddb1f54045842bbea8ea03e939443d17808':
  Work around an icu4c bug in TimeZoneNames::getDisplayName.
 2014-07-30 18:55:09 +00:00
PauloftheWest
8a084d6d26 am 86dc1219: am bb60518a: am fc0c3b43: Merge "Set new PBAP connections to always allow." into lmp-dev 
* commit '86dc1219a632ebcab1d7d895133e6143949e7a00':
  Set new PBAP connections to always allow.
 2014-07-30 18:33:16 +00:00
PauloftheWest
86dc1219a6 am bb60518a: am fc0c3b43: Merge "Set new PBAP connections to always allow." into lmp-dev 
* commit 'bb60518aec360f135da650afe4b0a448d2ec46b0':
  Set new PBAP connections to always allow.
 2014-07-30 18:28:24 +00:00
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
fdbee1a8e4 am d66e91de: am a5638b0c: am d117a96e: Merge "Settings: Fix ordering for interruptions alarm warning." into lmp-dev 
* commit 'd66e91de2f98005a780e54d90dee15d519a5627d':
  Settings: Fix ordering for interruptions alarm warning.
 2014-07-30 17:11:25 +00:00
John Spurlock
d66e91de2f am a5638b0c: am d117a96e: Merge "Settings: Fix ordering for interruptions alarm warning." into lmp-dev 
* commit 'a5638b0c877b46fc0ad38eb695cc22af6fa8e300':
  Settings: Fix ordering for interruptions alarm warning.
 2014-07-30 16:58:21 +00:00
PauloftheWest
ce17442f40 am cc58d272: am 33c02c98: am 361d870e: Added ability for user to automatically accept/deny Bluetooth Phonebook Syncs 
* commit 'cc58d2722b69ee815b50e557b6c7f0f1cbca5d0d':
  Added ability for user to automatically accept/deny Bluetooth Phonebook Syncs
 2014-07-30 16:55:45 +00:00
Alexandra Gherghina
c205b1fe8b am 8fbbeb9e: am 2653fe3c: am c8a1db19: Toggle between primary and managed profile in apps settings 
* commit '8fbbeb9efda5f9a524e3abdaa7d5729bad44cea9':
  Toggle between primary and managed profile in apps settings
 2014-07-30 16:55:39 +00:00
Fabrice Di Meglio
a3367ba5a4 am 1f9bf5f5: am 4b3e46ea: 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 '1f9bf5f57b1e3e1a5af4a7adeb3e8fd98d3158e3':
  Fix bug #16306535 The arrows rotate in the opposite direction... of the direction implied by the iconography (clockwise)
 2014-07-30 16:55:27 +00:00
Fabrice Di Meglio
a1a8eadc6d am 8156332a: am 7bdfe7fb: am 6d9a59f0: Merge "Fix bug #16660819 Switchbar text should be white not grey" into lmp-dev 
* commit '8156332a7e9a63564685ba80d325766ae2cc5341':
  Fix bug #16660819 Switchbar text should be white not grey
 2014-07-30 16:55:26 +00:00
Amith Yamasani
f2f9098e20 am 62a188e9: am 736ea0e8: am ba9643b9: Merge "Implement SET_PROFILE_OWNER intent" into lmp-dev 
* commit '62a188e98ff4c5f495e0a376bb481a71719200ac':
  Implement SET_PROFILE_OWNER intent
 2014-07-30 16:55:26 +00:00
Fabrice Di Meglio
51dd06b19f am e350e9e2: am 04d3520a: am 9ee40022: Merge "Make Battery History chart non selectable" into lmp-dev 
* commit 'e350e9e23a1a4517aff4cec5d3c1c9c8684a5d67':
  Make Battery History chart non selectable
 2014-07-30 16:55:24 +00:00
Fabrice Di Meglio
3896f148a1 am dd9b0ede: am 6662865e: am db7d2d16: Merge "Fix bug #16623129 Stability: Settings: NPE in RunningProcessesView... startServiceDetailsActivity(RunningProcessesView.java:394)" into lmp-dev 
* commit 'dd9b0ede1a03187fa7c4bb761b15c05160055b87':
  Fix bug #16623129 Stability: Settings: NPE in RunningProcessesView... startServiceDetailsActivity(RunningProcessesView.java:394)
 2014-07-30 16:55:18 +00:00
PauloftheWest
cc58d2722b am 33c02c98: am 361d870e: Added ability for user to automatically accept/deny Bluetooth Phonebook Syncs 
* commit '33c02c981be62a868fbae1996841d6ae1f43a342':
  Added ability for user to automatically accept/deny Bluetooth Phonebook Syncs
 2014-07-30 16:45:09 +00:00
Alexandra Gherghina
8fbbeb9efd am 2653fe3c: am c8a1db19: Toggle between primary and managed profile in apps settings 
* commit '2653fe3c0f38b9e3aa1718cd56abd61567c4f08f':
  Toggle between primary and managed profile in apps settings
 2014-07-30 16:43:27 +00:00
Fabrice Di Meglio
1f9bf5f57b am 4b3e46ea: 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 '4b3e46ea18f87ae46e346e2fbf638e6ca1f79a25':
  Fix bug #16306535 The arrows rotate in the opposite direction... of the direction implied by the iconography (clockwise)
 2014-07-30 16:40:30 +00:00
Fabrice Di Meglio
8156332a7e am 7bdfe7fb: am 6d9a59f0: Merge "Fix bug #16660819 Switchbar text should be white not grey" into lmp-dev 
* commit '7bdfe7fb839d5fa5811b5a403c0af2191e01c5a5':
  Fix bug #16660819 Switchbar text should be white not grey
 2014-07-30 16:40:23 +00:00
Amith Yamasani
62a188e98f am 736ea0e8: am ba9643b9: Merge "Implement SET_PROFILE_OWNER intent" into lmp-dev 
* commit '736ea0e8a8943cb213b385ce8e260628d88f3b3f':
  Implement SET_PROFILE_OWNER intent
 2014-07-30 16:39:23 +00:00
Fabrice Di Meglio
e350e9e23a am 04d3520a: am 9ee40022: Merge "Make Battery History chart non selectable" into lmp-dev 
* commit '04d3520a07912864bac4d25c48b34cf2f18e7157':
  Make Battery History chart non selectable
 2014-07-30 16:39:17 +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
Fabrice Di Meglio
dd9b0ede1a am 6662865e: am db7d2d16: Merge "Fix bug #16623129 Stability: Settings: NPE in RunningProcessesView... startServiceDetailsActivity(RunningProcessesView.java:394)" into lmp-dev 
* commit '6662865efa9ebef4d8f3a407a22c81c66923e576':
  Fix bug #16623129 Stability: Settings: NPE in RunningProcessesView... startServiceDetailsActivity(RunningProcessesView.java:394)
 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
Fabrice Di Meglio
08dfac85c4 am 8a239ef1: am 10fb4706: am 76307f52: Merge "Fix bug #16660405 Stability: ISE in Settings: Observer ... com.android.settings.SettingsPreferenceFragment@3c1d9ecb was not registered" into lmp-dev 
* commit '8a239ef148f912e5851db5df2a7ed67dabfdda61':
  Fix bug #16660405 Stability: ISE in Settings: Observer ... com.android.settings.SettingsPreferenceFragment$1@3c1d9ecb was not registered
 2014-07-30 14:36:16 +00:00
Fabrice Di Meglio
8a239ef148 am 10fb4706: am 76307f52: Merge "Fix bug #16660405 Stability: ISE in Settings: Observer ... com.android.settings.SettingsPreferenceFragment@3c1d9ecb was not registered" into lmp-dev 
* commit '10fb470622b7c3fddd8603be091b1429599b9bb2':
  Fix bug #16660405 Stability: ISE in Settings: Observer ... com.android.settings.SettingsPreferenceFragment$1@3c1d9ecb was not registered
 2014-07-30 14:16:13 +00: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