git.osdn.net Git - android-x86/packages-apps-Settings.git/log

(root) / android-x86 / packages-apps-Settings.git / log

Baligh Uddin [Thu, 24 Jul 2014 23:41:31 +0000 (23:41 +0000)]

am 30765f49: (-s ours) am c8f4e83d: (-s ours) am c3bd8097: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev

* commit '30765f497de684d72287fd26e1cc9696f8ac9617':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Paul Lawrence [Thu, 24 Jul 2014 23:41:30 +0000 (23:41 +0000)]

am a6ce40f4: am 4ea43465: am 832ad720: Merge "Show countdown of remaining decrypt attempts before wiping device" into lmp-dev

* commit 'a6ce40f461672fdbfef611bfcc90a7578b18b70c':
Show countdown of remaining decrypt attempts before wiping device

commit | commitdiff | tree

Fabrice Di Meglio [Thu, 24 Jul 2014 23:41:29 +0000 (23:41 +0000)]

am c79ba3b8: am 997e93cc: am 6cef9d23: Merge "Fix bug #16515550 Settings app crashes for intent com.android.settings.QUICK_LAUNCH_SETTINGS" into lmp-dev

* commit 'c79ba3b870048e9e0fd57a232bf5de71615735cd':
Fix bug #16515550 Settings app crashes for intent com.android.settings.QUICK_LAUNCH_SETTINGS

commit | commitdiff | tree

Adam Lesinski [Thu, 24 Jul 2014 23:41:29 +0000 (23:41 +0000)]

am 44b0c71d: am 2c276024: am 468d3916: Implement the Usage Access Settings UI

* commit '44b0c71d1399ba24c2b85ae3272d97fcc3c854f5':
Implement the Usage Access Settings UI

commit | commitdiff | tree

PauloftheWest [Thu, 24 Jul 2014 23:41:27 +0000 (23:41 +0000)]

am bd1403f8: am 742dd6d4: am 28fc05a1: Merge "Added SIM Card Activity to Settings" into lmp-dev

* commit 'bd1403f85079958132427f523ee738ade98ca0f6':
Added SIM Card Activity to Settings

commit | commitdiff | tree

PauloftheWest [Thu, 24 Jul 2014 23:41:26 +0000 (23:41 +0000)]

am 38b2a89e: am ff455f40: am 958d1ee6: Merge "Fixed an illustrious NullPointer bug on Wifi Assistant" into lmp-dev

* commit '38b2a89ee06d1eba67e5c13e76d9ca22b41125b5':
Fixed an illustrious NullPointer bug on Wifi Assistant

commit | commitdiff | tree

John Spurlock [Thu, 24 Jul 2014 23:41:25 +0000 (23:41 +0000)]

am 06fbbf6f: am 384ad06e: am a8e0a5b5: Merge "Settings: Add to the zen alarm string." into lmp-dev

* commit '06fbbf6f313c161980f2d28d81b19942a9adb306':
Settings: Add to the zen alarm string.

commit | commitdiff | tree

Paul Lawrence [Thu, 24 Jul 2014 23:41:24 +0000 (23:41 +0000)]

am 40b8f460: am 741bad53: am e68f5224: Show correct string when prompting for pattern before encrypting

* commit '40b8f46072ad242fc420d922cffb83b082e84894':
Show correct string when prompting for pattern before encrypting

commit | commitdiff | tree

Alexandra Gherghina [Thu, 24 Jul 2014 23:41:24 +0000 (23:41 +0000)]

am 6b68dba3: am 214712dd: am 2513851a: Adds cross-profile intents for Settings screens.

* commit '6b68dba3b0721a5688e3933089b5879f1c804e12':
Adds cross-profile intents for Settings screens.

commit | commitdiff | tree

Alexandra Gherghina [Thu, 24 Jul 2014 23:41:23 +0000 (23:41 +0000)]

am 26e2f3ac: am 2a459d30: am 377b8df3: Merge "Checks if the right user has a restriction" into lmp-dev

* commit '26e2f3acff6ffb814d0d839a96e0917f4ea5c8e1':
Checks if the right user has a restriction

commit | commitdiff | tree

Baligh Uddin [Thu, 24 Jul 2014 23:36:02 +0000 (23:36 +0000)]

am c8f4e83d: (-s ours) am c3bd8097: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev

* commit 'c8f4e83de27af48cef4e49fd536e9fef3374c841':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Paul Lawrence [Thu, 24 Jul 2014 23:36:02 +0000 (23:36 +0000)]

am 4ea43465: am 832ad720: Merge "Show countdown of remaining decrypt attempts before wiping device" into lmp-dev

* commit '4ea43465fa12efbe064f24d583a39409caa3cf3d':
Show countdown of remaining decrypt attempts before wiping device

commit | commitdiff | tree

Fabrice Di Meglio [Thu, 24 Jul 2014 23:35:32 +0000 (23:35 +0000)]

am 997e93cc: am 6cef9d23: Merge "Fix bug #16515550 Settings app crashes for intent com.android.settings.QUICK_LAUNCH_SETTINGS" into lmp-dev

* commit '997e93cca483985d31236d66023bc83e24154ba1':
Fix bug #16515550 Settings app crashes for intent com.android.settings.QUICK_LAUNCH_SETTINGS

commit | commitdiff | tree

Adam Lesinski [Thu, 24 Jul 2014 23:34:45 +0000 (23:34 +0000)]

am 2c276024: am 468d3916: Implement the Usage Access Settings UI

* commit '2c27602438ce8a1d39c856e834b6405aa96d3218':
Implement the Usage Access Settings UI

commit | commitdiff | tree

PauloftheWest [Thu, 24 Jul 2014 23:34:36 +0000 (23:34 +0000)]

am 742dd6d4: am 28fc05a1: Merge "Added SIM Card Activity to Settings" into lmp-dev

* commit '742dd6d40603c424a161c68d70828180cf334533':
Added SIM Card Activity to Settings

commit | commitdiff | tree

PauloftheWest [Thu, 24 Jul 2014 23:33:57 +0000 (23:33 +0000)]

am ff455f40: am 958d1ee6: Merge "Fixed an illustrious NullPointer bug on Wifi Assistant" into lmp-dev

* commit 'ff455f40b6ed9f3781d5ea58be7d66c74e94a77c':
Fixed an illustrious NullPointer bug on Wifi Assistant

commit | commitdiff | tree

John Spurlock [Thu, 24 Jul 2014 23:31:18 +0000 (23:31 +0000)]

am 384ad06e: am a8e0a5b5: Merge "Settings: Add to the zen alarm string." into lmp-dev

* commit '384ad06ec0357e8e9c7915f66d6795d6f9ba2819':
Settings: Add to the zen alarm string.

commit | commitdiff | tree

Paul Lawrence [Thu, 24 Jul 2014 23:31:06 +0000 (23:31 +0000)]

am 741bad53: am e68f5224: Show correct string when prompting for pattern before encrypting

* commit '741bad53a060700b639f4a061e0f63702224bb39':
Show correct string when prompting for pattern before encrypting

commit | commitdiff | tree

Alexandra Gherghina [Thu, 24 Jul 2014 23:30:49 +0000 (23:30 +0000)]

am 214712dd: am 2513851a: Adds cross-profile intents for Settings screens.

* commit '214712dda0a9ecea1af609b0e1029cbf627e73aa':
Adds cross-profile intents for Settings screens.

commit | commitdiff | tree

Alexandra Gherghina [Thu, 24 Jul 2014 23:30:48 +0000 (23:30 +0000)]

am 2a459d30: am 377b8df3: Merge "Checks if the right user has a restriction" into lmp-dev

* commit '2a459d300850d98adf5d2d47f051e9a17d7c669e':
Checks if the right user has a restriction

commit | commitdiff | tree

Baligh Uddin [Thu, 24 Jul 2014 21:52:43 +0000 (21:52 +0000)]

am c3bd8097: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev

* commit 'c3bd8097d8d4085cbe855ce3f1d570f6edc54891':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Paul Lawrence [Thu, 24 Jul 2014 21:52:43 +0000 (21:52 +0000)]

am 832ad720: Merge "Show countdown of remaining decrypt attempts before wiping device" into lmp-dev

* commit '832ad7206299be6db94e82e2387c0fcf8df53e7e':
Show countdown of remaining decrypt attempts before wiping device

commit | commitdiff | tree

Fabrice Di Meglio [Thu, 24 Jul 2014 21:26:47 +0000 (21:26 +0000)]

am 6cef9d23: Merge "Fix bug #16515550 Settings app crashes for intent com.android.settings.QUICK_LAUNCH_SETTINGS" into lmp-dev

* commit '6cef9d23b8572d8bd87329999f10286e29a861c0':
Fix bug #16515550 Settings app crashes for intent com.android.settings.QUICK_LAUNCH_SETTINGS

commit | commitdiff | tree

Baligh Uddin [Thu, 24 Jul 2014 21:46:51 +0000 (21:46 +0000)]

Merge "Import translations. DO NOT MERGE" into lmp-dev

commit | commitdiff | tree

Baligh Uddin [Thu, 24 Jul 2014 09:51:46 +0000 (02:51 -0700)]

Import translations. DO NOT MERGE

Change-Id: Icc3bdff4feb649defa6e44414fb07663054eb753
Auto-generated-cl: translation import

commit | commitdiff | tree

Paul Lawrence [Thu, 24 Jul 2014 21:45:01 +0000 (21:45 +0000)]

Merge "Show countdown of remaining decrypt attempts before wiping device" into lmp-dev

commit | commitdiff | tree

Adam Lesinski [Thu, 24 Jul 2014 20:30:37 +0000 (20:30 +0000)]

am 468d3916: Implement the Usage Access Settings UI

* commit '468d39160fd417cf23cba3d592acb349d3f59c55':
Implement the Usage Access Settings UI

commit | commitdiff | tree

Adam Lesinski [Tue, 22 Jul 2014 17:01:08 +0000 (10:01 -0700)]

Implement the Usage Access Settings UI

Scans for apps requesting permission to use the
UsageStats API and displays them so that the user
can grant or deny access.

Bug: 16461070

Change-Id: Ie9f611688581cdd60ffe9f59e566f658ac2564e9

commit | commitdiff | tree

PauloftheWest [Thu, 24 Jul 2014 20:02:57 +0000 (20:02 +0000)]

am 28fc05a1: Merge "Added SIM Card Activity to Settings" into lmp-dev

* commit '28fc05a12bc26c79be697c347dd2930094900744':
Added SIM Card Activity to Settings

commit | commitdiff | tree

Fabrice Di Meglio [Thu, 24 Jul 2014 19:48:10 +0000 (19:48 +0000)]

am e2953d9f: am 76f5c3bc: Merge "More code cleaning for the Home intent filters" into lmp-dev

* commit 'e2953d9f5fcee4cb4d84911e3e7e0f75c521bfb2':
More code cleaning for the Home intent filters

commit | commitdiff | tree

Fabrice Di Meglio [Thu, 24 Jul 2014 19:47:58 +0000 (19:47 +0000)]

am d2f47cc2: am 87915ea0: Merge "Code cleaning" into lmp-dev

* commit 'd2f47cc243ae64568f737023e450b03a40ea72c5':
Code cleaning

commit | commitdiff | tree

Fabrice Di Meglio [Thu, 24 Jul 2014 19:47:30 +0000 (19:47 +0000)]

am e0c5dd07: am 456229cc: Merge "Fix how Home Activities are refreshed" into lmp-dev

* commit 'e0c5dd07979b57940264f1b72957bd84ecb88740':
Fix how Home Activities are refreshed

commit | commitdiff | tree

Fabrice Di Meglio [Thu, 24 Jul 2014 19:46:30 +0000 (19:46 +0000)]

am b90ce51c: am 1e9405b5: Merge "Add Settings Dashboard refresh for Home activities" into lmp-dev

* commit 'b90ce51c3dd222cc761d5bd01ffff2039b976224':
Add Settings Dashboard refresh for Home activities

commit | commitdiff | tree

Jim Miller [Thu, 24 Jul 2014 19:46:26 +0000 (19:46 +0000)]

am 18be821a: am dfd2c6f2: Change wording in keyguard settings menu.

* commit '18be821acacd14cd7e8425c53095e8a2f4bd2b69':
Change wording in keyguard settings menu.

commit | commitdiff | tree

Maurice Lam [Thu, 24 Jul 2014 19:46:24 +0000 (19:46 +0000)]

am 7fbde725: am 56d781b3: Merge "[WifiSetup] Tablet landscape layout" into lmp-dev

* commit '7fbde72593b42d452ac492c00845b097efa8f0b4':
[WifiSetup] Tablet landscape layout

commit | commitdiff | tree

Fabrice Di Meglio [Thu, 24 Jul 2014 19:46:08 +0000 (19:46 +0000)]

am fd45a5c6: am 56fc6a75: Merge "Code cleaning for Index" into lmp-dev

* commit 'fd45a5c6352d734b7cf27e8da6e6f133f364612c':
Code cleaning for Index

commit | commitdiff | tree

PauloftheWest [Thu, 24 Jul 2014 18:51:10 +0000 (18:51 +0000)]

am 958d1ee6: Merge "Fixed an illustrious NullPointer bug on Wifi Assistant" into lmp-dev

* commit '958d1ee6d584b7489d57071305c44635a0534ba9':
Fixed an illustrious NullPointer bug on Wifi Assistant

commit | commitdiff | tree

Paul Lawrence [Wed, 23 Jul 2014 20:57:17 +0000 (13:57 -0700)]

Show countdown of remaining decrypt attempts before wiping device

Bug: 16496992
Change-Id: Ibdd4bbbf9a9eeafee5e0e5ed48464d524628cf12

commit | commitdiff | tree

PauloftheWest [Thu, 24 Jul 2014 18:46:07 +0000 (18:46 +0000)]

Merge "Fixed an illustrious NullPointer bug on Wifi Assistant" into lmp-dev

commit | commitdiff | tree

PauloftheWest [Thu, 24 Jul 2014 18:40:21 +0000 (11:40 -0700)]

Fixed an illustrious NullPointer bug on Wifi Assistant

+ The class was never instantiated...

Bug: 16543506
Change-Id: I00882df31ee986116b8fa28a54796bb3b20f2e2b

commit | commitdiff | tree

Fabrice Di Meglio [Thu, 24 Jul 2014 21:22:06 +0000 (21:22 +0000)]

Merge "Fix bug #16515550 Settings app crashes for intent com.android.settings.QUICK_LAUNCH_SETTINGS" into lmp-dev

commit | commitdiff | tree

Fabrice Di Meglio [Thu, 24 Jul 2014 03:03:20 +0000 (20:03 -0700)]

Fix bug #16515550 Settings app crashes for intent com.android.settings.QUICK_LAUNCH_SETTINGS

- make it work again (what a code...)

Change-Id: Ic71d8e40ff8a5e0c663fd40655e4f4cc31bc8caf

commit | commitdiff | tree

Baligh Uddin [Thu, 24 Jul 2014 21:46:49 +0000 (21:46 +0000)]

Merge "Import translations. DO NOT MERGE"

commit | commitdiff | tree

Fabrice Di Meglio [Thu, 24 Jul 2014 20:00:00 +0000 (20:00 +0000)]

am 459baaa9: am e2953d9f: am 76f5c3bc: Merge "More code cleaning for the Home intent filters" into lmp-dev

* commit '459baaa9f577a8ec641eca3581ab523b2cd4f695':
More code cleaning for the Home intent filters

commit | commitdiff | tree

Fabrice Di Meglio [Thu, 24 Jul 2014 20:00:00 +0000 (20:00 +0000)]

am 24d06e1d: am d2f47cc2: am 87915ea0: Merge "Code cleaning" into lmp-dev

* commit '24d06e1da4a1c85574ae814e44aef9ef236f7c08':
Code cleaning

commit | commitdiff | tree

Fabrice Di Meglio [Thu, 24 Jul 2014 19:59:55 +0000 (19:59 +0000)]

am 0a1732f9: am e0c5dd07: am 456229cc: Merge "Fix how Home Activities are refreshed" into lmp-dev

* commit '0a1732f9611f5099554bdc61c376556d33302949':
Fix how Home Activities are refreshed

commit | commitdiff | tree

Fabrice Di Meglio [Thu, 24 Jul 2014 19:59:53 +0000 (19:59 +0000)]

am 482bcaf1: am b90ce51c: am 1e9405b5: Merge "Add Settings Dashboard refresh for Home activities" into lmp-dev

* commit '482bcaf10769cf1725e60dd76da8bcd358faa5c7':
Add Settings Dashboard refresh for Home activities

commit | commitdiff | tree

Jim Miller [Thu, 24 Jul 2014 19:59:52 +0000 (19:59 +0000)]

am ab2b852c: am 18be821a: am dfd2c6f2: Change wording in keyguard settings menu.

* commit 'ab2b852cee8a178097b34d42d5482fecd638414f':
Change wording in keyguard settings menu.

commit | commitdiff | tree

Maurice Lam [Thu, 24 Jul 2014 19:59:51 +0000 (19:59 +0000)]

am 66336045: am 7fbde725: am 56d781b3: Merge "[WifiSetup] Tablet landscape layout" into lmp-dev

* commit '66336045c461a1ce32855b50a150b91bd2c569cc':
[WifiSetup] Tablet landscape layout

commit | commitdiff | tree

Fabrice Di Meglio [Thu, 24 Jul 2014 19:59:50 +0000 (19:59 +0000)]

am 3e552110: am fd45a5c6: am 56fc6a75: Merge "Code cleaning for Index" into lmp-dev

* commit '3e552110423393020d589998bf21696f3924585a':
Code cleaning for Index

commit | commitdiff | tree

PauloftheWest [Thu, 24 Jul 2014 19:59:03 +0000 (19:59 +0000)]

Merge "Added SIM Card Activity to Settings" into lmp-dev

commit | commitdiff | tree

John Spurlock [Thu, 24 Jul 2014 15:31:02 +0000 (15:31 +0000)]

am a8e0a5b5: Merge "Settings: Add to the zen alarm string." into lmp-dev

* commit 'a8e0a5b5f9a1d9fbade91909d57eb431fed69a86':
Settings: Add to the zen alarm string.

commit | commitdiff | tree

Paul Lawrence [Thu, 24 Jul 2014 15:15:09 +0000 (15:15 +0000)]

am e68f5224: Show correct string when prompting for pattern before encrypting

* commit 'e68f5224e4359aef7f62c94130d5b9b221bee389':
Show correct string when prompting for pattern before encrypting

commit | commitdiff | tree

Paul Lawrence [Wed, 23 Jul 2014 21:14:53 +0000 (14:14 -0700)]

Show correct string when prompting for pattern before encrypting

Bug: 16505763
Change-Id: I05d874be7651f68688d6582236541f418ec6afc2

commit | commitdiff | tree

PauloftheWest [Mon, 30 Jun 2014 17:02:36 +0000 (10:02 -0700)]

Added SIM Card Activity to Settings

+ Added SIM Card menu to Settings menu
+ Added SIM card detail dialog when selecting a SIM Card
+ Added ability to select the default SIM for Cellular data, Calls, and SMS

Bug: 16241745

Change-Id: I43437aa4c591c5097a8865d564f88726671e1b7d

commit | commitdiff | tree

Alexandra Gherghina [Thu, 24 Jul 2014 12:51:08 +0000 (12:51 +0000)]

am 2513851a: Adds cross-profile intents for Settings screens.

* commit '2513851ace8d353f99146316b81a430add6d837f':
Adds cross-profile intents for Settings screens.

commit | commitdiff | tree

Alexandra Gherghina [Mon, 21 Jul 2014 21:42:21 +0000 (22:42 +0100)]

Adds cross-profile intents for Settings screens.

This is needed for settings that are handled in the primary profile app.

Bug: 16369104
Change-Id: If3ec3866778282219267481b8f419774f7f2c9de

commit | commitdiff | tree

Alexandra Gherghina [Thu, 24 Jul 2014 12:27:14 +0000 (12:27 +0000)]

am 377b8df3: Merge "Checks if the right user has a restriction" into lmp-dev

* commit '377b8df3ed89f2e61b6755aee8136754a2edf9c5':
Checks if the right user has a restriction

commit | commitdiff | tree

Baligh Uddin [Thu, 24 Jul 2014 10:02:05 +0000 (03:02 -0700)]

Import translations. DO NOT MERGE

Change-Id: Ife340467faf89de06d9f21c3331ad7ccae209635
Auto-generated-cl: translation import

commit | commitdiff | tree

Fabrice Di Meglio [Thu, 24 Jul 2014 02:41:04 +0000 (02:41 +0000)]

am 76f5c3bc: Merge "More code cleaning for the Home intent filters" into lmp-dev

* commit '76f5c3bc722b7450870c586bffef1688e96607b7':
More code cleaning for the Home intent filters

commit | commitdiff | tree

Fabrice Di Meglio [Thu, 24 Jul 2014 02:10:29 +0000 (02:10 +0000)]

am 87915ea0: Merge "Code cleaning" into lmp-dev

* commit '87915ea074c62b591a2f9967c57ab21412c6cae8':
Code cleaning

commit | commitdiff | tree

Fabrice Di Meglio [Thu, 24 Jul 2014 01:31:21 +0000 (01:31 +0000)]

am 456229cc: Merge "Fix how Home Activities are refreshed" into lmp-dev

* commit '456229ccdfb6ddb8cd1ac3be939e1c2221f4bedd':
Fix how Home Activities are refreshed

commit | commitdiff | tree

Fabrice Di Meglio [Wed, 23 Jul 2014 23:35:57 +0000 (23:35 +0000)]

am 1e9405b5: Merge "Add Settings Dashboard refresh for Home activities" into lmp-dev

* commit '1e9405b5cc35d598507fccdfa0e833ab83b2cfd9':
Add Settings Dashboard refresh for Home activities

commit | commitdiff | tree

Jim Miller [Wed, 23 Jul 2014 23:23:58 +0000 (23:23 +0000)]

am dfd2c6f2: Change wording in keyguard settings menu.

* commit 'dfd2c6f261df4d5de5111524bd6205406d0e72db':
Change wording in keyguard settings menu.

commit | commitdiff | tree

Jim Miller [Wed, 23 Jul 2014 23:01:06 +0000 (16:01 -0700)]

Change wording in keyguard settings menu.

Fixes bug 15167729

Change-Id: Ie748b25667de3d237da34fc9b6a7bedad3ae1dcc

commit | commitdiff | tree

Maurice Lam [Wed, 23 Jul 2014 23:03:29 +0000 (23:03 +0000)]

am 56d781b3: Merge "[WifiSetup] Tablet landscape layout" into lmp-dev

* commit '56d781b32b7aad0fb0bb41aae26ce896f1fedfdc':
[WifiSetup] Tablet landscape layout

commit | commitdiff | tree

Fabrice Di Meglio [Wed, 23 Jul 2014 22:44:41 +0000 (22:44 +0000)]

am 56fc6a75: Merge "Code cleaning for Index" into lmp-dev

* commit '56fc6a75302c8525e45d6898901f45b0de526944':
Code cleaning for Index

commit | commitdiff | tree

PauloftheWest [Wed, 23 Jul 2014 22:04:54 +0000 (22:04 +0000)]

am dc5db975: am ac1dedaf: am d89febb6: Merge "Fixed bug where multiple access points would show connected" into lmp-dev

* commit 'dc5db975aaae95ec4e27d48b7748364692afa2b9':
Fixed bug where multiple access points would show connected

commit | commitdiff | tree

PauloftheWest [Wed, 23 Jul 2014 22:00:48 +0000 (22:00 +0000)]

am ac1dedaf: am d89febb6: Merge "Fixed bug where multiple access points would show connected" into lmp-dev

* commit 'ac1dedafa197624568b6959c5b497b877791d9dc':
Fixed bug where multiple access points would show connected

commit | commitdiff | tree

Alan Viverette [Wed, 23 Jul 2014 22:00:15 +0000 (22:00 +0000)]

am 7444eb54: am 8f866a5a: am 68419fca: Merge "Use activity for brightness dialog" into lmp-dev

* commit '7444eb5475b94ac7205c0845b172f4c5b6da4880':
Use activity for brightness dialog

commit | commitdiff | tree

Dianne Hackborn [Wed, 23 Jul 2014 22:00:14 +0000 (22:00 +0000)]

am 1c286fbd: am cc20a5b1: am f151ea34: Merge "Work on issue #16135174: Apps page "smoke" gradient footer must be removed" into lmp-dev

* commit '1c286fbdae93ab09edd7493c72c7d8c42d5ce678':
Work on issue #16135174: Apps page "smoke" gradient footer must be removed

commit | commitdiff | tree

Julia Reynolds [Wed, 23 Jul 2014 22:00:13 +0000 (22:00 +0000)]

am 6bcd506f: am e4e607a3: am 1a0297c5: Use restrictionsprovider framework in Settings.

* commit '6bcd506f224e4a9f0ae15873189d7838c60733ee':
Use restrictionsprovider framework in Settings.

commit | commitdiff | tree

Alan Viverette [Wed, 23 Jul 2014 21:55:52 +0000 (21:55 +0000)]

am 8f866a5a: am 68419fca: Merge "Use activity for brightness dialog" into lmp-dev

* commit '8f866a5a941bf2e6db587bfbc826fa3b3fccc748':
Use activity for brightness dialog

commit | commitdiff | tree

Dianne Hackborn [Wed, 23 Jul 2014 21:55:39 +0000 (21:55 +0000)]

am cc20a5b1: am f151ea34: Merge "Work on issue #16135174: Apps page "smoke" gradient footer must be removed" into lmp-dev

* commit 'cc20a5b1fee8081582abd782d6f871e99e18e8b9':
Work on issue #16135174: Apps page "smoke" gradient footer must be removed

commit | commitdiff | tree

Julia Reynolds [Wed, 23 Jul 2014 21:55:33 +0000 (21:55 +0000)]

am e4e607a3: am 1a0297c5: Use restrictionsprovider framework in Settings.

* commit 'e4e607a3832a4894419c96726361a752a435fe70':
Use restrictionsprovider framework in Settings.

commit | commitdiff | tree

PauloftheWest [Wed, 23 Jul 2014 21:55:25 +0000 (21:55 +0000)]

am d89febb6: Merge "Fixed bug where multiple access points would show connected" into lmp-dev

* commit 'd89febb6deebc681063eacbf95dbe4fdfb8533e5':
Fixed bug where multiple access points would show connected

commit | commitdiff | tree

Alan Viverette [Wed, 23 Jul 2014 21:47:04 +0000 (21:47 +0000)]

am 68419fca: Merge "Use activity for brightness dialog" into lmp-dev

* commit '68419fca2d03b8c5afd9f5dfecef8a4415ff063d':
Use activity for brightness dialog

commit | commitdiff | tree

Dianne Hackborn [Wed, 23 Jul 2014 21:43:17 +0000 (21:43 +0000)]

am f151ea34: Merge "Work on issue #16135174: Apps page "smoke" gradient footer must be removed" into lmp-dev

* commit 'f151ea34824105068ebadae43fe165e79587f9f6':
Work on issue #16135174: Apps page "smoke" gradient footer must be removed

commit | commitdiff | tree

Julia Reynolds [Wed, 23 Jul 2014 21:22:51 +0000 (21:22 +0000)]

am 1a0297c5: Use restrictionsprovider framework in Settings.

* commit '1a0297c544cb15ed4b56e70575b169b3889543b7':
Use restrictionsprovider framework in Settings.

commit | commitdiff | tree

Julia Reynolds [Wed, 18 Jun 2014 13:23:15 +0000 (09:23 -0400)]

Use restrictionsprovider framework in Settings.

Bug: 15305103

Change-Id: Ib0147e366fe90de3512d0cc06e2a47ee16012dff

commit | commitdiff | tree

Fabrice Di Meglio [Wed, 23 Jul 2014 20:47:53 +0000 (20:47 +0000)]

am f8af2566: am 5f71155c: am 289a63f5: Merge "Fix NotificationStation theming" into lmp-dev

* commit 'f8af2566f22033c057b21befffc1e9801b502bb1':
Fix NotificationStation theming

commit | commitdiff | tree

Fabrice Di Meglio [Wed, 23 Jul 2014 20:45:14 +0000 (20:45 +0000)]

am 5f71155c: am 289a63f5: Merge "Fix NotificationStation theming" into lmp-dev

* commit '5f71155cbc4e677a7bac07296154deef89592e22':
Fix NotificationStation theming

commit | commitdiff | tree

Fabrice Di Meglio [Wed, 23 Jul 2014 20:41:33 +0000 (20:41 +0000)]

am 289a63f5: Merge "Fix NotificationStation theming" into lmp-dev

* commit '289a63f509972372e37fc95de630a5410b4ebd5c':
Fix NotificationStation theming

commit | commitdiff | tree

Fabrice Di Meglio [Wed, 23 Jul 2014 20:28:15 +0000 (20:28 +0000)]

am 8fc6c006: am 2f2a23de: am a79400de: Merge "Code cleaning for NotificationStation" into lmp-dev

* commit '8fc6c006522138dca6dc72d11b2b9a51ef4ded5e':
Code cleaning for NotificationStation

commit | commitdiff | tree

Fabrice Di Meglio [Wed, 23 Jul 2014 20:24:13 +0000 (20:24 +0000)]

am 2f2a23de: am a79400de: Merge "Code cleaning for NotificationStation" into lmp-dev

* commit '2f2a23dee368e04995211994defd72eb8f406a3c':
Code cleaning for NotificationStation

commit | commitdiff | tree

Fabrice Di Meglio [Wed, 23 Jul 2014 20:19:36 +0000 (20:19 +0000)]

am a79400de: Merge "Code cleaning for NotificationStation" into lmp-dev

* commit 'a79400defc90a65437589cd5ede8de291692c75f':
Code cleaning for NotificationStation

commit | commitdiff | tree

Fabrice Di Meglio [Wed, 23 Jul 2014 20:05:48 +0000 (20:05 +0000)]

am d2bc6f45: am c95775b5: am 6cad2550: Merge "OwnerInfos code cleaning" into lmp-dev

* commit 'd2bc6f453c6f923ddb1ac0c0d9afee9a27de8b32':
OwnerInfos code cleaning

commit | commitdiff | tree

Fabrice Di Meglio [Wed, 23 Jul 2014 20:01:25 +0000 (20:01 +0000)]

am c95775b5: am 6cad2550: Merge "OwnerInfos code cleaning" into lmp-dev

* commit 'c95775b543366e36e652c7d5f04e5b21121053f9':
OwnerInfos code cleaning

commit | commitdiff | tree

Fabrice Di Meglio [Wed, 23 Jul 2014 19:56:46 +0000 (19:56 +0000)]

am 6cad2550: Merge "OwnerInfos code cleaning" into lmp-dev

* commit '6cad255000e2bff5475e0816d18e4b0b68481283':
OwnerInfos code cleaning

commit | commitdiff | tree

John Spurlock [Wed, 23 Jul 2014 19:36:14 +0000 (19:36 +0000)]

am 2daea077: am 5c399368: am d39d7314: Merge "Settings: Wire up Display > Lift to wake." into lmp-dev

* commit '2daea077674caffd34d2022cd4cd37516d919f8c':
Settings: Wire up Display > Lift to wake.

commit | commitdiff | tree

John Spurlock [Wed, 23 Jul 2014 19:28:01 +0000 (19:28 +0000)]

am 5c399368: am d39d7314: Merge "Settings: Wire up Display > Lift to wake." into lmp-dev

* commit '5c3993682ab792d7a98792d30181a32e8cb96548':
Settings: Wire up Display > Lift to wake.

commit | commitdiff | tree

John Spurlock [Wed, 23 Jul 2014 19:23:46 +0000 (19:23 +0000)]

am d39d7314: Merge "Settings: Wire up Display > Lift to wake." into lmp-dev

* commit 'd39d731473efbc84ec5640d89d0f275c759b3402':
Settings: Wire up Display > Lift to wake.

commit | commitdiff | tree

Alexandra Gherghina [Thu, 24 Jul 2014 12:21:41 +0000 (12:21 +0000)]

Merge "Checks if the right user has a restriction" into lmp-dev

commit | commitdiff | tree

Alexandra Gherghina [Wed, 23 Jul 2014 21:07:03 +0000 (22:07 +0100)]

Checks if the right user has a restriction

Bug: 15466880
Change-Id: I9199c6054e9955a90958fd3a751f321cf6fa9990

commit | commitdiff | tree

Maurice Lam [Wed, 23 Jul 2014 23:00:41 +0000 (23:00 +0000)]

Merge "[WifiSetup] Tablet landscape layout" into lmp-dev

commit | commitdiff | tree

Maurice Lam [Fri, 18 Jul 2014 03:35:15 +0000 (20:35 -0700)]

[WifiSetup] Tablet landscape layout

Created setup_preference for sw600dp-land, modeled after
template_with_header in Setup Wizard. Copied over wide illustration,
which is again a placeholder and needs real graphics from UX.
Renamed SetupWizardHeader to SetupWizardIllustration. Added
aspectRatio attribute to SetupWizardIllustration that, will set the
aspect ratio of the top padding. If 0 or not specified, padding will
not be set.

Bug: 16349429
Change-Id: Ic2623ee0c0ee8864383d22da006b418b8c371bf0

commit | commitdiff | tree

Fabrice Di Meglio [Wed, 23 Jul 2014 22:39:10 +0000 (22:39 +0000)]

Merge "Code cleaning for Index" into lmp-dev

commit | commitdiff | tree

Fabrice Di Meglio [Wed, 23 Jul 2014 22:22:44 +0000 (15:22 -0700)]

Code cleaning for Index

- make that UpdateData class static

Change-Id: I22ac148613fcaa4ed3ad615c4eca037b5dc6b986

commit | commitdiff | tree

Fabrice Di Meglio [Wed, 23 Jul 2014 20:31:26 +0000 (13:31 -0700)]

Fix NotificationStation theming

- fix padding for the ListView
- fix ActionBar size
- remove non needed switchBarMargins

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

Change-Id: I0e3d3116f2ee749a04a8a464b36fa68909edf11d

commit | commitdiff | tree

Fabrice Di Meglio [Wed, 23 Jul 2014 20:07:52 +0000 (13:07 -0700)]

Code cleaning for NotificationStation

- remove dead code and vars
- log exceptions

Change-Id: Idff91c27620955a3458c2358b629331e140aedba

packages/apps/Settings

RSS Atom

About OSDN

Find Software

Develop Software

Help