Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
14,848 Commits 1 Branch 0 Tags
4c7a058cf339e5f5111ee0a97448281dde853c0d
Commit Graph

6558 Commits

Author SHA1 Message Date
Fabrice Di Meglio
4c7a058cf3 am d950abe9: am 83ce7d83: am dec81120: Merge "Enforce the presence of the Indexable interface for Indexing" into lmp-dev 
* commit 'd950abe968b6d6a629b61f0bdb95373aaff65383':
  Enforce the presence of the Indexable interface for Indexing
 2014-07-25 19:25:37 +00:00
Amith Yamasani
17f51beb7a am adbc1d32: am c5a80a98: am 2d578ce2: Don\'t use the profile info for name 
* commit 'adbc1d32652fa3d496f6061e302ed0818f5eb1ac':
  Don't use the profile info for name
 2014-07-25 17:12:43 +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
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
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
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
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
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
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
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
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
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
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
468d39160f 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
 2014-07-24 13:24:19 -07:00
Paul Lawrence
bd4c3210e1 Show countdown of remaining decrypt attempts before wiping device 
Bug: 16496992
Change-Id: Ibdd4bbbf9a9eeafee5e0e5ed48464d524628cf12
 2014-07-24 08:38:24 -07:00
Fabrice Di Meglio
a8469d285e Merge "More fixes for QuickLaunchSettings" into lmp-dev 2014-07-24 15:36:21 +00:00
PauloftheWest
958d1ee6d5 Merge "Fixed an illustrious NullPointer bug on Wifi Assistant" into lmp-dev 2014-07-24 15:36:14 +00:00
PauloftheWest
63a1affdae Fixed an illustrious NullPointer bug on Wifi Assistant 
+ The class was never instantiated...

Bug: 16543506
Change-Id: I00882df31ee986116b8fa28a54796bb3b20f2e2b
 2014-07-24 11:45:22 -07:00
Fabrice Di Meglio
6cef9d23b8 Merge "Fix bug #16515550 Settings app crashes for intent com.android.settings.QUICK_LAUNCH_SETTINGS" into lmp-dev 2014-07-24 15:36:02 +00:00
Fabrice Di Meglio
9bf0ca9f2a 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
 2014-07-24 20:00:00 +00:00
Fabrice Di Meglio
3cd4e5625c am 24d06e1d: am d2f47cc2: am 87915ea0: Merge "Code cleaning" into lmp-dev 
* commit '24d06e1da4a1c85574ae814e44aef9ef236f7c08':
  Code cleaning
 2014-07-24 20:00:00 +00:00
Fabrice Di Meglio
ccf4cf33f7 am 0a1732f9: am e0c5dd07: am 456229cc: Merge "Fix how Home Activities are refreshed" into lmp-dev 
* commit '0a1732f9611f5099554bdc61c376556d33302949':
  Fix how Home Activities are refreshed
 2014-07-24 19:59:55 +00:00
Fabrice Di Meglio
74c842d31a 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
 2014-07-24 19:59:53 +00:00
Maurice Lam
4548c34ece am 66336045: am 7fbde725: am 56d781b3: Merge "[WifiSetup] Tablet landscape layout" into lmp-dev 
* commit '66336045c461a1ce32855b50a150b91bd2c569cc':
  [WifiSetup] Tablet landscape layout
 2014-07-24 19:59:51 +00:00
Fabrice Di Meglio
4be6250bee am 3e552110: am fd45a5c6: am 56fc6a75: Merge "Code cleaning for Index" into lmp-dev 
* commit '3e552110423393020d589998bf21696f3924585a':
  Code cleaning for Index
 2014-07-24 19:59:50 +00:00
PauloftheWest
28fc05a12b Merge "Added SIM Card Activity to Settings" into lmp-dev 2014-07-24 15:35:58 +00:00
Paul Lawrence
e68f5224e4 Show correct string when prompting for pattern before encrypting 
Bug: 16505763
Change-Id: I05d874be7651f68688d6582236541f418ec6afc2
 2014-07-24 15:11:16 +00:00
PauloftheWest
3815561997 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
 2014-07-24 06:41:12 -07:00
Alexandra Gherghina
2513851ace 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
 2014-07-24 13:45:52 +01:00
PauloftheWest
9c982871c7 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
 2014-07-23 22:04:54 +00:00
Alan Viverette
71a0924e24 am 7444eb54: am 8f866a5a: am 68419fca: Merge "Use activity for brightness dialog" into lmp-dev 
* commit '7444eb5475b94ac7205c0845b172f4c5b6da4880':
  Use activity for brightness dialog
 2014-07-23 22:00:15 +00:00
Dianne Hackborn
d2b634110d 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
 2014-07-23 22:00:14 +00:00
Julia Reynolds
23e921850b am 6bcd506f: am e4e607a3: am 1a0297c5: Use restrictionsprovider framework in Settings. 
* commit '6bcd506f224e4a9f0ae15873189d7838c60733ee':
  Use restrictionsprovider framework in Settings.
 2014-07-23 22:00:13 +00:00
Julia Reynolds
1a0297c544 Use restrictionsprovider framework in Settings. 
Bug: 15305103

Change-Id: Ib0147e366fe90de3512d0cc06e2a47ee16012dff
 2014-07-23 21:06:21 +00:00
Fabrice Di Meglio
12dfa2ed18 am f8af2566: am 5f71155c: am 289a63f5: Merge "Fix NotificationStation theming" into lmp-dev 
* commit 'f8af2566f22033c057b21befffc1e9801b502bb1':
  Fix NotificationStation theming
 2014-07-23 20:47:53 +00:00
Fabrice Di Meglio
d9ca152d37 am 8fc6c006: am 2f2a23de: am a79400de: Merge "Code cleaning for NotificationStation" into lmp-dev 
* commit '8fc6c006522138dca6dc72d11b2b9a51ef4ded5e':
  Code cleaning for NotificationStation
 2014-07-23 20:28:15 +00:00
Fabrice Di Meglio
d59d8d3b5e am d2bc6f45: am c95775b5: am 6cad2550: Merge "OwnerInfos code cleaning" into lmp-dev 
* commit 'd2bc6f453c6f923ddb1ac0c0d9afee9a27de8b32':
  OwnerInfos code cleaning
 2014-07-23 20:05:48 +00:00
John Spurlock
c3fc2cbf38 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.
 2014-07-23 19:36:14 +00:00
Alexandra Gherghina
377b8df3ed Merge "Checks if the right user has a restriction" into lmp-dev 2014-07-23 19:22:09 +00:00
Alexandra Gherghina
e82d0f2f8e Checks if the right user has a restriction 
Bug: 15466880
Change-Id: I9199c6054e9955a90958fd3a751f321cf6fa9990
 2014-07-23 22:09:07 +01:00
Maurice Lam
56d781b32b Merge "[WifiSetup] Tablet landscape layout" into lmp-dev 2014-07-23 18:56:15 +00:00
Maurice Lam
068354a1bb [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
 2014-07-23 14:10:46 -07:00