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
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
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
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
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
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
7cc81061a8
am 8d5d57cb: am e3de4ca0: am 01daaca5: Remove unnecessary code.
...
* commit '8d5d57cbc243afe9cd814f66770338e100b97746':
Remove unnecessary code.
2014-07-29 20:31:34 +00:00
Svetoslav
8d5d57cbc2
am e3de4ca0: am 01daaca5: Remove unnecessary code.
...
* commit 'e3de4ca04cb0a15e0cc3588eff9f6544427ce208':
Remove unnecessary code.
2014-07-29 20:27:44 +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
7521693e66
am 23955e33: am c13c0bd5: am d5ec63ad: Merge "Fix bug #16382239 "Searching for Printers" progress bar is not Material / Quantum" into lmp-dev
...
* commit '23955e3362d56e14bc6fc5ea063f32ca321c1168':
Fix bug #16382239 "Searching for Printers" progress bar is not Material / Quantum
2014-07-29 17:36:47 +00:00
Fabrice Di Meglio
23955e3362
am c13c0bd5: am d5ec63ad: Merge "Fix bug #16382239 "Searching for Printers" progress bar is not Material / Quantum" into lmp-dev
...
* commit 'c13c0bd5dd0784c484a9e5088e0b4007be2d3965':
Fix bug #16382239 "Searching for Printers" progress bar is not Material / Quantum
2014-07-29 17:32:42 +00: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
d483ecf738
am 132d7e49: (-s ours) am b3891f44: am 09b5228a: New activity that asks users to confirm their pattern. DO NOT MERGE
...
* commit '132d7e495779cbe05f30b36f12dc7f56274af418':
New activity that asks users to confirm their pattern. DO NOT MERGE
2014-07-29 17:16:14 +00:00
Jay Civelli
132d7e4957
am b3891f44: am 09b5228a: New activity that asks users to confirm their pattern. DO NOT MERGE
...
* commit 'b3891f448768fd4263dd53cbb358b9b57f64ae10':
New activity that asks users to confirm their pattern. DO NOT MERGE
2014-07-29 17:08:25 +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
b4df7f3cc4
am ecd1fac9: am 6d09e061: am 4a45be2f: Merge "Move global sync settings dialogs to the right screen" into lmp-dev
...
* commit 'ecd1fac93d6a1b6fa994d445fe7828b63a255362':
Move global sync settings dialogs to the right screen
2014-07-29 15:39:26 +00:00
Alexandra Gherghina
ecd1fac93d
am 6d09e061: am 4a45be2f: Merge "Move global sync settings dialogs to the right screen" into lmp-dev
...
* commit '6d09e061ef6fd524e39b8d9ff87ba586c17c2d32':
Move global sync settings dialogs to the right screen
2014-07-29 15:36:14 +00:00
Alexandra Gherghina
564951273c
am 13d7bc4c: am c7142442: am 9017d3fd: Update the resource name to the new ic_corp prefix one.
...
* commit '13d7bc4c8ae61152d6f7d6184689413a62ca0c7f':
Update the resource name to the new ic_corp prefix one.
2014-07-29 15:35:16 +00:00
Alexandra Gherghina
13d7bc4c8a
am c7142442: am 9017d3fd: Update the resource name to the new ic_corp prefix one.
...
* commit 'c7142442e617c99d0a67ea0de5c57b26c4ca5206':
Update the resource name to the new ic_corp prefix one.
2014-07-29 15:31:52 +00: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
8c3aafad94
am b5e8bf20: am 4b7e002b: am a6145a65: Toggle between primary and managed profile in App notif settings
...
* commit 'b5e8bf20a976f2fa26447c81ab4795843e8e54d1':
Toggle between primary and managed profile in App notif settings
2014-07-29 13:42:08 +00:00
Zoltan Szatmary-Ban
db9d8403e1
am 53612829: am 46c8a9bf: am 0598e6f6: Merge "Fix refresh issue of badged icons in Battery Settings" into lmp-dev
...
* commit '536128294fd96824acb809fdd435b4bf16d4815d':
Fix refresh issue of badged icons in Battery Settings
2014-07-29 13:32:13 +00:00
Zoltan Szatmary-Ban
267b103348
am 7832c091: am b77ef9be: am 74f34e49: Merge "Update Data Usage Settings for Enterprise" into lmp-dev
...
* commit '7832c0913db9fa9cabdb3f78d6b6f54467798de5':
Update Data Usage Settings for Enterprise
2014-07-29 13:32:11 +00:00
Alexandra Gherghina
402052d8ec
am ff05c160: am 0d78165a: am 11b8bda9: Refactors listening logic in AccountSettings
...
* commit 'ff05c1605fcaf7c14eb453ed49bd883551a6df76':
Refactors listening logic in AccountSettings
2014-07-29 13:32:10 +00:00
Alexandra Gherghina
b896591562
am 707c9653: am 76cc239f: am fe47a8dc: Toggle between primary and managed profile in Print Settings
...
* commit '707c96533ca204270bdf87120ac7f897ed3f6098':
Toggle between primary and managed profile in Print Settings
2014-07-29 13:32:09 +00:00
Alexandra Gherghina
b5e8bf20a9
am 4b7e002b: am a6145a65: Toggle between primary and managed profile in App notif settings
...
* commit '4b7e002b7dc471b273b1a597c7ac03dc2220cd88':
Toggle between primary and managed profile in App notif settings
2014-07-29 13:29:13 +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
Zoltan Szatmary-Ban
536128294f
am 46c8a9bf: am 0598e6f6: Merge "Fix refresh issue of badged icons in Battery Settings" into lmp-dev
...
* commit '46c8a9bf8e90f58dd9003c2af836aa578221f1a9':
Fix refresh issue of badged icons in Battery Settings
2014-07-29 13:14:57 +00:00
Zoltan Szatmary-Ban
7832c0913d
am b77ef9be: am 74f34e49: Merge "Update Data Usage Settings for Enterprise" into lmp-dev
...
* commit 'b77ef9bee2595d5d375cde3cf829a153d668af0d':
Update Data Usage Settings for Enterprise
2014-07-29 13:14:56 +00:00