PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
9,727 Commits 1 Branch 0 Tags
4b5728bbfb9e5e439e53ee6f08f55b025211a14c
Commit Graph

9727 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dianne Hackborn
8416f45384 am 2c41f7be: Merge "Fix issue #7226978: Still in app detail screen after uninstall" into jb-mr1-dev 
* commit '2c41f7be44715483de4d3e9c8a91488c4f723e90':
  Fix issue #7226978: Still in app detail screen after uninstall
 2012-10-04 17:22:32 -07:00
Dianne Hackborn
2c41f7be44 Merge "Fix issue #7226978: Still in app detail screen after uninstall" into jb-mr1-dev 2012-10-04 17:20:45 -07:00
Jeff Sharkey
51e6e175ed am a5b6ba8a: am ef62a198: am 113e4b6a: Merge "Refresh authenticator info when accounts change." into jb-mr1-dev 
* commit 'a5b6ba8afb7a81ca975d58c61fc152e11a34871f':
  Refresh authenticator info when accounts change.
 2012-10-04 16:47:14 -07:00
Jeff Sharkey
a5b6ba8afb am ef62a198: am 113e4b6a: Merge "Refresh authenticator info when accounts change." into jb-mr1-dev 
* commit 'ef62a19855cbfac35ba1c4b1a14caa75e271b512':
  Refresh authenticator info when accounts change.
 2012-10-04 16:44:42 -07:00
Jeff Sharkey
ef62a19855 am 113e4b6a: Merge "Refresh authenticator info when accounts change." into jb-mr1-dev 
* commit '113e4b6aa1dfbc49abdf6366909ceb4a6923d114':
  Refresh authenticator info when accounts change.
 2012-10-04 16:42:27 -07:00
Jeff Sharkey
113e4b6aa1 Merge "Refresh authenticator info when accounts change." into jb-mr1-dev 2012-10-04 16:40:25 -07:00
Amith Yamasani
8f6060f639 Move the position of widget choosers to below lockscreen settings in Security 
Bug: 7261302

Move the 2 widget options on lockscreen to below the lock related items, just
above the Owner Info item.

Change-Id: I373b915e15bc93ce7e56f5982999afa1e5aed281
 2012-10-04 16:21:36 -07:00
Dianne Hackborn
ab616d477b Fix issue #7226978: Still in app detail screen after uninstall 
Change-Id: I3b03db0a68bfab5dd010474ee714d5f7a5538af0
 2012-10-04 15:44:50 -07:00
Baligh Uddin
0974c0aabe Import translations. DO NOT MERGE 
Change-Id: I3c441df6a35ab942ed6467ae938baa18f719a1f7
Auto-generated-cl: translation import
 2012-10-04 15:02:57 -07:00
Baligh Uddin
eabf97657b Import translations. DO NOT MERGE 
Change-Id: I1d77c147969acf45abfa5eb4924fb20639d409ee
Auto-generated-cl: translation import
 2012-10-04 15:00:03 -07:00
Baligh Uddin
ad5454ff3b Import translations. DO NOT MERGE 
Change-Id: I9d3249b9c3962ef225c8f7566f8aa96805d89355
Auto-generated-cl: translation import
 2012-10-04 14:58:30 -07:00
Baligh Uddin
92c45de11a am 484cbeba: (-s ours) am f55a3a1e: am 27636444: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 
* commit '484cbebafd3d4e2456f4fa0b82fffbb7987ba0ae':
  Import translations. DO NOT MERGE
 2012-10-04 10:44:35 -07:00
Baligh Uddin
484cbebafd am f55a3a1e: am 27636444: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 
* commit 'f55a3a1e3464a79fc4cf080fac8903a566373960':
  Import translations. DO NOT MERGE
 2012-10-04 10:43:34 -07:00
Baligh Uddin
f55a3a1e34 am 27636444: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 
* commit '27636444a4be011a6a813cba6429e58629316ce4':
  Import translations. DO NOT MERGE
 2012-10-04 10:40:56 -07:00
Baligh Uddin
c8f223ca69 Merge "Import translations. DO NOT MERGE" 2012-10-04 10:39:12 -07:00
Baligh Uddin
27636444a4 Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 2012-10-04 10:38:54 -07:00
Baligh Uddin
eb8a8b87e8 am a35de94f: (-s ours) am 771daf38: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev 
* commit 'a35de94f80b87030dc0a953ac8e5e7d2d991378f':
  Import translations. DO NOT MERGE
 2012-10-04 10:05:35 -07:00
Baligh Uddin
a35de94f80 am 771daf38: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev 
* commit '771daf38ea35c670f2eac8512d8058daaec1434f':
  Import translations. DO NOT MERGE
 2012-10-04 10:02:15 -07:00
Baligh Uddin
771daf38ea Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev 2012-10-04 10:00:58 -07:00
The Android Open Source Project
18e357cd2e am 90870780: (-s ours) Reconcile with jb-mr1-release - do not merge 
* commit '90870780c8019d67c2abd502dba3a92dce91bebe':
 2012-10-04 07:52:38 -07:00
The Android Open Source Project
90870780c8 Reconcile with jb-mr1-release - do not merge 
Change-Id: Ic92ccbe7031853f464542711f57fcf1e1d7112fb
 2012-10-04 07:50:00 -07:00
The Android Automerger
9958d3582d merge in jb-mr1-release history after reset to jb-mr1-dev 2012-10-04 07:00:18 -07:00
Baligh Uddin
1e12997cdd Import translations. DO NOT MERGE 
Change-Id: Id5af20206cbddba6f19716c027f1ef279038d696
Auto-generated-cl: translation import
 2012-10-03 21:25:27 -07:00
Baligh Uddin
8948fa5090 Import translations. DO NOT MERGE 
Change-Id: I5e5c043d16bb59b50b4341a44827c824c564786c
Auto-generated-cl: translation import
 2012-10-03 21:23:00 -07:00
Baligh Uddin
48be9aa3a8 Import translations. DO NOT MERGE 
Change-Id: I65e354b797114c305fdce72fd57ee8039e16630a
Auto-generated-cl: translation import
 2012-10-03 21:21:22 -07:00
Amith Yamasani
a3bc45b258 am dc592eeb: am 8a55b2d5: am 875fa8af: Merge "No decoration for WifiSetup activity used by SetupWizard" into jb-mr1-dev 
* commit 'dc592eebf125ac71c1b45ad1b6e797a1787d0528':
  No decoration for WifiSetup activity used by SetupWizard
 2012-10-03 17:56:43 -07:00
Amith Yamasani
dc592eebf1 am 8a55b2d5: am 875fa8af: Merge "No decoration for WifiSetup activity used by SetupWizard" into jb-mr1-dev 
* commit '8a55b2d545d9e2d10afc2f5bf98e0ea6f43182de':
  No decoration for WifiSetup activity used by SetupWizard
 2012-10-03 17:54:56 -07:00
Amith Yamasani
8a55b2d545 am 875fa8af: Merge "No decoration for WifiSetup activity used by SetupWizard" into jb-mr1-dev 
* commit '875fa8affb0f3b0ac39120833a7778f92c97b965':
  No decoration for WifiSetup activity used by SetupWizard
 2012-10-03 17:52:59 -07:00
Amith Yamasani
875fa8affb Merge "No decoration for WifiSetup activity used by SetupWizard" into jb-mr1-dev 2012-10-03 17:50:59 -07:00
alanv
eef72c39ae Announce dynamic content changes in lock confirmation settings. 
Also re-orders updateStage() and setText/Selection calls so that text
events don't flush announcements. This does not change functionality.

Bug: 7256500
Change-Id: I8b10d66e9f73c7a630a8c3c5128372e18f26234c
 2012-10-03 17:10:50 -07:00
Adam Powell
788abde481 am 8bb4fc52: am c767066d: am c8e609c4: Merge "Navigation fixes for Settings" into jb-mr1-dev 
* commit '8bb4fc525131624066b43de776ab0e636e6578a3':
  Navigation fixes for Settings
 2012-10-03 17:03:25 -07:00
Adam Powell
8bb4fc5251 am c767066d: am c8e609c4: Merge "Navigation fixes for Settings" into jb-mr1-dev 
* commit 'c767066d52880d439daa1912392431943a35fe38':
  Navigation fixes for Settings
 2012-10-03 17:00:59 -07:00
Adam Powell
c767066d52 am c8e609c4: Merge "Navigation fixes for Settings" into jb-mr1-dev 
* commit 'c8e609c49d836ec8c87bc52b9f592693fd860f1d':
  Navigation fixes for Settings
 2012-10-03 16:59:13 -07:00
Adam Powell
c8e609c49d Merge "Navigation fixes for Settings" into jb-mr1-dev 2012-10-03 16:57:44 -07:00
Jeff Sharkey
9ff79c19bd Refresh authenticator info when accounts change. 
There may be newly installed authenticators, so refresh them when
accounts change.

Bug: 7280043
Change-Id: Ic173970c815950526c77a2653e7fae4551948f13
 2012-10-03 16:49:35 -07:00
Adam Powell
4684ae8eca Navigation fixes for Settings 
Change quick-entry points to Settings to have taskAffinity="",
excludeFromRecents="true", and no parentActivityName.

This makes the various quick shortcuts more standalone; their task
state does not persist and they have no Up navigation available. As
most shortcuts do not launch these activities with
FLAG_ACTIVITY_TASK_ON_HOME, Back will return the user to the previous
task.

This does not affect the "real" versions of these settings screens as
navigated to through the front door of the Settings app; those screens
are reached through SubSettings instances with specific fragments
added.

Bug 7276291

Change-Id: I7864437277601a3f6b6beded44a5edfd4636010c
 2012-10-03 16:36:20 -07:00
Amith Yamasani
ded980a6e5 No decoration for WifiSetup activity used by SetupWizard 
Bug: 7274530
Change-Id: I981aa5fb3fca854f0b378b7c219feb92567598ce
 2012-10-03 16:23:35 -07:00
Jeff Sharkey
237236a1a0 am f56fa1d8: am 396c24ce: am ffec6eac: Merge "Avoid NPE when installing app update." into jb-mr1-dev 
* commit 'f56fa1d83aa46f4992130e995c378070432024b7':
  Avoid NPE when installing app update.
 2012-10-03 16:21:29 -07:00
Jeff Sharkey
f56fa1d83a am 396c24ce: am ffec6eac: Merge "Avoid NPE when installing app update." into jb-mr1-dev 
* commit '396c24ce99192ad02d4661bcb8607786e42a09ae':
  Avoid NPE when installing app update.
 2012-10-03 16:18:51 -07:00
Jeff Sharkey
396c24ce99 am ffec6eac: Merge "Avoid NPE when installing app update." into jb-mr1-dev 
* commit 'ffec6eaca53c521d18e8bd295f4e3b896cefedb5':
  Avoid NPE when installing app update.
 2012-10-03 16:17:17 -07:00
Jeff Sharkey
ffec6eaca5 Merge "Avoid NPE when installing app update." into jb-mr1-dev 2012-10-03 16:15:31 -07:00
Jeff Sharkey
347188667b Avoid NPE when installing app update. 
PMS sends REMOVED followed quickly by ADDED.  Ignore when missing
package, since it may be coming back shortly.  Eventually we should
change this to watch EXTRA_REPLACING.

Bug: 7269896
Change-Id: I3b518f4faee34019c5c808824d5e46261f6d206a
 2012-10-03 16:06:41 -07:00
Svetoslav Ganov
82e5cfbc32 am 89a2d54a: am 9b6af82c: am 69643009: Merge "Add a11y content descriptions and label mapping to Dreams." into jb-mr1-dev 
* commit '89a2d54aefb7b1fd0e41a283162a57005f75ebcf':
  Add a11y content descriptions and label mapping to Dreams.
 2012-10-03 14:04:42 -07:00
Svetoslav Ganov
89a2d54aef am 9b6af82c: am 69643009: Merge "Add a11y content descriptions and label mapping to Dreams." into jb-mr1-dev 
* commit '9b6af82c298dddaf8b870ac6e59ce3e7c267fc36':
  Add a11y content descriptions and label mapping to Dreams.
 2012-10-03 13:54:08 -07:00
Svetoslav Ganov
9b6af82c29 am 69643009: Merge "Add a11y content descriptions and label mapping to Dreams." into jb-mr1-dev 
* commit '69643009a663bdd64b4fbe7a08c4c7a2111d2207':
  Add a11y content descriptions and label mapping to Dreams.
 2012-10-03 13:06:52 -07:00
Svetoslav Ganov
69643009a6 Merge "Add a11y content descriptions and label mapping to Dreams." into jb-mr1-dev 2012-10-03 13:05:06 -07:00
The Android Open Source Project
f3f4ef05ee am 852ebb61: (-s ours) Reconcile with jb-mr1-release - do not merge 
* commit '852ebb61f4d30f7c4eb15705fecb6361dd2681b0':
 2012-10-03 07:40:19 -07:00
The Android Open Source Project
852ebb61f4 Reconcile with jb-mr1-release - do not merge 
Change-Id: I28f81c04fd28b62d82de00f525ccd76911114bd3
 2012-10-03 07:35:14 -07:00
The Android Automerger
60c848e172 merge in jb-mr1-release history after reset to jb-mr1-dev 2012-10-03 07:00:16 -07:00
Amith Yamasani
f9a95796d5 am d187eae5: am 42abadb0: am 2fa8cf73: Merge "Use new color avatar assets" into jb-mr1-dev 
* commit 'd187eae558bda7eb485fe859f34ae06f54cba5f3':
  Use new color avatar assets
 2012-10-02 22:27:03 -07:00