PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
15,563 Commits 1 Branch 0 Tags
2d8392b7ce11a9691e34092f16a8740fe89b5f8c
Commit Graph

15563 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Amith Yamasani
c5a80a987d am 2d578ce2: Don\'t use the profile info for name 
* commit '2d578ce29391dc72fde7330ff9ff909347ec531b':
  Don't use the profile info for name
 2014-07-25 16:46:48 +00:00
Amith Yamasani
2d578ce293 Don't use the profile info for name 
Since we now have a way to directly edit the user's photo/name
via a dialog, don't rely on the Me profile name anymore. That
one will be out of sync with the manual nickname editing.

Bug: 15761405
Change-Id: Ia16c43ddcfd47894b2d2e049802d7de153ea5b94
 2014-07-25 09:37:33 -07:00
Fabrice Di Meglio
a1e01f0e41 am b666f1fd: am 48aad314: am 8610ff9e: Merge "Fix Preferences background color" into lmp-dev 
* commit 'b666f1fd9062c64b8294bcd19d19e2ff7b0a17e5':
  Fix Preferences background color
 2014-07-25 03:11:26 +00:00
Fabrice Di Meglio
b666f1fd90 am 48aad314: am 8610ff9e: Merge "Fix Preferences background color" into lmp-dev 
* commit '48aad314577d650a27d5d2c45b570f0845d889d9':
  Fix Preferences background color
 2014-07-25 03:07:18 +00:00
Fabrice Di Meglio
48aad31457 am 8610ff9e: Merge "Fix Preferences background color" into lmp-dev 
* commit '8610ff9ea678201920bf6fb7d3a2b141226f6640':
  Fix Preferences background color
 2014-07-25 03:03:43 +00:00
Fabrice Di Meglio
9a60d7b569 Enforce the presence of the Indexable interface for Indexing 
- check that the Indexable interface has been defined before indexing

Change-Id: Ia61915b2bd1240226ba560ecfd883a115b49da95
 2014-07-24 19:53:47 -07:00
Fabrice Di Meglio
1bf89b742d Fix Preferences background color 
- use #FFFAFAFA instead of pure white

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

Change-Id: I287eda45950f8c537b7b96df7a2cf996e6e465b4
 2014-07-24 17:03:04 -07:00
Fabrice Di Meglio
71827c78ec am b0abf33f: am a757b61e: am a8469d28: Merge "More fixes for QuickLaunchSettings" into lmp-dev 
* commit 'b0abf33f6cf617e5854dd801406bc98df4766eb0':
  More fixes for QuickLaunchSettings
 2014-07-24 23:41:33 +00:00
Amith Yamasani
409fbb738b am 4069869e: am 156d1827: am ee398747: Refactor User Profile editor dialog for reuse 
* commit '4069869e2cedefe0778af812cba760124445aada':
  Refactor User Profile editor dialog for reuse
 2014-07-24 23:41:33 +00:00
rich cannings
adc92594d4 am c642e3d9: am 0ed8633f: am b8684d57: Remove "Verify apps" from Security settings 
* commit 'c642e3d915ba649702bddd9b6fe60d9210d0ccd0':
  Remove "Verify apps" from Security settings
 2014-07-24 23:41:32 +00:00
Baligh Uddin
4ad7fa45e4 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
 2014-07-24 23:41:31 +00:00
Paul Lawrence
5a67abbbdd 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
 2014-07-24 23:41:30 +00:00
Fabrice Di Meglio
479f70cd02 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
 2014-07-24 23:41:29 +00:00
Adam Lesinski
9bac84340b am 44b0c71d: am 2c276024: am 468d3916: Implement the Usage Access Settings UI 
* commit '44b0c71d1399ba24c2b85ae3272d97fcc3c854f5':
  Implement the Usage Access Settings UI
 2014-07-24 23:41:29 +00:00
PauloftheWest
5c416a6bf0 am bd1403f8: am 742dd6d4: am 28fc05a1: Merge "Added SIM Card Activity to Settings" into lmp-dev 
* commit 'bd1403f85079958132427f523ee738ade98ca0f6':
  Added SIM Card Activity to Settings
 2014-07-24 23:41:27 +00:00
PauloftheWest
e774c8866b 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
 2014-07-24 23:41:26 +00:00
John Spurlock
159af1cb3f 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.
 2014-07-24 23:41:25 +00:00
Paul Lawrence
67a588bc43 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
 2014-07-24 23:41:24 +00:00
Alexandra Gherghina
8061efef1e am 6b68dba3: am 214712dd: am 2513851a: Adds cross-profile intents for Settings screens. 
* commit '6b68dba3b0721a5688e3933089b5879f1c804e12':
  Adds cross-profile intents for Settings screens.
 2014-07-24 23:41:24 +00:00
Alexandra Gherghina
a5476113d4 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
 2014-07-24 23:41:23 +00:00
Fabrice Di Meglio
b0abf33f6c am a757b61e: am a8469d28: Merge "More fixes for QuickLaunchSettings" into lmp-dev 
* commit 'a757b61ec96eda097f67375621b23c797539d4dc':
  More fixes for QuickLaunchSettings
 2014-07-24 23:37:14 +00:00
Amith Yamasani
4069869e2c am 156d1827: am ee398747: Refactor User Profile editor dialog for reuse 
* commit '156d1827806d70060952f4d0d1752c455a7dcfbc':
  Refactor User Profile editor dialog for reuse
 2014-07-24 23:37:14 +00:00
rich cannings
c642e3d915 am 0ed8633f: am b8684d57: Remove "Verify apps" from Security settings 
* commit '0ed8633fed9856c5f1baa6fac322eb03934d4d72':
  Remove "Verify apps" from Security settings
 2014-07-24 23:36:57 +00:00
Baligh Uddin
30765f497d am c8f4e83d: (-s ours) am c3bd8097: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit 'c8f4e83de27af48cef4e49fd536e9fef3374c841':
  Import translations. DO NOT MERGE
 2014-07-24 23:36:02 +00:00
Paul Lawrence
a6ce40f461 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
 2014-07-24 23:36:02 +00:00
Fabrice Di Meglio
c79ba3b870 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
 2014-07-24 23:35:32 +00:00
Adam Lesinski
44b0c71d13 am 2c276024: am 468d3916: Implement the Usage Access Settings UI 
* commit '2c27602438ce8a1d39c856e834b6405aa96d3218':
  Implement the Usage Access Settings UI
 2014-07-24 23:34:45 +00:00
PauloftheWest
bd1403f850 am 742dd6d4: am 28fc05a1: Merge "Added SIM Card Activity to Settings" into lmp-dev 
* commit '742dd6d40603c424a161c68d70828180cf334533':
  Added SIM Card Activity to Settings
 2014-07-24 23:34:36 +00:00
PauloftheWest
38b2a89ee0 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
 2014-07-24 23:33:57 +00:00
John Spurlock
06fbbf6f31 am 384ad06e: am a8e0a5b5: Merge "Settings: Add to the zen alarm string." into lmp-dev 
* commit '384ad06ec0357e8e9c7915f66d6795d6f9ba2819':
  Settings: Add to the zen alarm string.
 2014-07-24 23:31:18 +00:00
Paul Lawrence
40b8f46072 am 741bad53: am e68f5224: Show correct string when prompting for pattern before encrypting 
* commit '741bad53a060700b639f4a061e0f63702224bb39':
  Show correct string when prompting for pattern before encrypting
 2014-07-24 23:31:06 +00:00
Alexandra Gherghina
6b68dba3b0 am 214712dd: am 2513851a: Adds cross-profile intents for Settings screens. 
* commit '214712dda0a9ecea1af609b0e1029cbf627e73aa':
  Adds cross-profile intents for Settings screens.
 2014-07-24 23:30:49 +00:00
Alexandra Gherghina
26e2f3acff 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
 2014-07-24 23:30:48 +00:00
Fabrice Di Meglio
a757b61ec9 am a8469d28: Merge "More fixes for QuickLaunchSettings" into lmp-dev 
* commit 'a8469d285e1956e2a90a4475ad6e5981dee34223':
  More fixes for QuickLaunchSettings
 2014-07-24 23:23:55 +00:00
Amith Yamasani
156d182780 am ee398747: Refactor User Profile editor dialog for reuse 
* commit 'ee3987475e1d29e8355bdb9e068149eb01e3fd43':
  Refactor User Profile editor dialog for reuse
 2014-07-24 23:23:54 +00:00
Amith Yamasani
ee3987475e Refactor User Profile editor dialog for reuse 
Move the dialog code into a separate class.
Use it from RestrictedProfileSettings
and UserSettings for the current user.

Bug: 15761405
Change-Id: I0b9a95ba8463304525e6a4b8cf3b4ca77b15796f
 2014-07-24 23:13:34 +00:00
rich cannings
0ed8633fed am b8684d57: Remove "Verify apps" from Security settings 
* commit 'b8684d573e1357ee573f26d511a630b39e368d0f':
  Remove "Verify apps" from Security settings
 2014-07-24 22:47:13 +00:00
Fabrice Di Meglio
e20e169bbe More fixes for QuickLaunchSettings 
- use DialogWhenLarge on tabletUI
- update layouts for following Material theme

Change-Id: If7aa153168eae9d2e72c50e4ae38bcd2fa6bb4bd
 2014-07-24 15:46:35 -07:00
Fabrice Di Meglio
096c0c46fb Merge "Implement #15841213 Search - index Developer Option only and only if they have been activated" into lmp-dev 2014-07-24 22:43:15 +00:00
Fabrice Di Meglio
dec811201f Merge "Enforce the presence of the Indexable interface for Indexing" into lmp-dev 2014-07-24 22:43:15 +00:00
rich cannings
b8684d573e Remove "Verify apps" from Security settings 
The setting moved to Google settings

Bug: 15588470
Change-Id: I40c0b6073949a69bfb8f0fa8f9fd405fbf9946de
 2014-07-24 15:13:23 -07:00
Fabrice Di Meglio
8610ff9ea6 Merge "Fix Preferences background color" into lmp-dev 2014-07-24 22:06:48 +00:00
Baligh Uddin
c8f4e83de2 am c3bd8097: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit 'c3bd8097d8d4085cbe855ce3f1d570f6edc54891':
  Import translations. DO NOT MERGE
 2014-07-24 21:52:43 +00:00
Paul Lawrence
4ea43465fa 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
 2014-07-24 21:52:43 +00:00
Fabrice Di Meglio
997e93cca4 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
 2014-07-24 21:26:47 +00:00
Fabrice Di Meglio
e3ff4d8e92 Fix bug #16515550 Settings app crashes for intent com.android.settings.QUICK_LAUNCH_SETTINGS 
- make it work again (what a code...)

Change-Id: Ic71d8e40ff8a5e0c663fd40655e4f4cc31bc8caf
 2014-07-24 14:07:02 -07:00
Baligh Uddin
c3bd8097d8 Merge "Import translations. DO NOT MERGE" into lmp-dev 2014-07-24 20:48:02 +00:00
Baligh Uddin
1de9e58b20 Import translations. DO NOT MERGE 
Change-Id: Icc3bdff4feb649defa6e44414fb07663054eb753
Auto-generated-cl: translation import
 2014-07-24 21:44:52 +00:00
Paul Lawrence
832ad72062 Merge "Show countdown of remaining decrypt attempts before wiping device" into lmp-dev 2014-07-24 20:48:02 +00:00
Adam Lesinski
2c27602438 am 468d3916: Implement the Usage Access Settings UI 
* commit '468d39160fd417cf23cba3d592acb349d3f59c55':
  Implement the Usage Access Settings UI
 2014-07-24 20:30:37 +00:00