PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
7,064 Commits 1 Branch 0 Tags
238be5dcdd4084912cb3ec1a48a2f08be71fe7cc
Commit Graph

7064 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Eric Fischer
91c03e0e44 am 34eeb2b3: (-s ours) am 7978ef63: Merge "Import translations. DO NOT MERGE" into jb-dev 
* commit '34eeb2b3e92e329d8a088352e1eb17af769b22fa':
  Import translations. DO NOT MERGE
 2012-05-15 11:37:38 -07:00
Daisuke Miyakawa
f07dc694fb am c7b53cd8: am 16d91c19: Modify menu layout for sound setting 
* commit 'c7b53cd85cc3e5699098d072fd1bbb372a5ea755':
  Modify menu layout for sound setting
 2012-05-15 11:37:37 -07:00
Jeff Sharkey
02b327e7f2 Clear references after Data Usage View removed. 
Bug: 6450986
Change-Id: Ia28479983fc192cbeefb16b8ce03f67241e4002c
 2012-05-15 11:33:59 -07:00
Irfan Sheriff
0c925dc715 Push wifi direct to overflow menu 
Bug: 6469022
Change-Id: I62e4b4372416a5fbaf43a52be71f7291b761997b
 2012-05-15 11:32:21 -07:00
Jim Miller
f1f3f2a63e am 6da25703: Merge "Fix 6110711: Fix buttons on ChooseLockPattern for landscape layout" into jb-dev 
* commit '6da25703db587c5414df734baf9ac7e5cb504b70':
  Fix 6110711: Fix buttons on ChooseLockPattern for landscape layout
 2012-05-15 11:31:52 -07:00
Amith Yamasani
f1b02c8b1a am 904bc315: Merge "Fix NPE in Display Settings." into jb-dev 
* commit '904bc3155f06a1b02ac8a5985ac781d8d6dee798':
  Fix NPE in Display Settings.
 2012-05-15 11:31:25 -07:00
Eric Laurent
50fcedf776 am 10636840: Merge "Implement new volume display policy." into jb-dev 
* commit '106368400d4798e14daf3c32100bc87c35a480b0':
  Implement new volume display policy.
 2012-05-15 11:30:51 -07:00
Danielle Millett
5177a7d853 am 1cbd519e: Merge "Removing the blink checkbox and strings" into jb-dev 
* commit '1cbd519ebc8f9c93563a796fa404492678388b31':
  Removing the blink checkbox and strings
 2012-05-15 11:30:48 -07:00
Eric Fischer
34eeb2b3e9 am 7978ef63: Merge "Import translations. DO NOT MERGE" into jb-dev 
* commit '7978ef631ab861130ec0fa2713692bccf5edbbaf':
  Import translations. DO NOT MERGE
 2012-05-15 11:30:00 -07:00
Daisuke Miyakawa
c7b53cd85c am 16d91c19: Modify menu layout for sound setting 
* commit '16d91c19dcabea63f38757ab5cafb56c29ad22e8':
  Modify menu layout for sound setting
 2012-05-15 11:29:55 -07:00
The Android Automerger
58a6017662 merge in nakasi-factoryrom-release history after reset to jb-dev 2012-05-15 09:36:06 -07:00
The Android Automerger
4f03c1042c merge in jb-release history after reset to jb-dev 2012-05-15 07:06:02 -07:00
Jeff Sharkey
caf15613c2 Enforce READ_EXTERNAL in Developer Options. 
Move from Storage to Developer Options, and add interstitial dialog
with more details.

Bug: 6461446
Change-Id: I6d3d8fdc61a3e920ed58ab4d726949ac3c31feab
 2012-05-14 20:53:11 -07:00
Jim Miller
6da25703db Merge "Fix 6110711: Fix buttons on ChooseLockPattern for landscape layout" into jb-dev 2012-05-14 19:59:04 -07:00
Amith Yamasani
fc7d53289c am 77f75098: am 97bbb533: Merge "Fix up-navigation for different levels of Settings screens." into jb-dev 
* commit '77f75098cca85bfc6a33dbe939eda6e1ecf8e47f':
  Fix up-navigation for different levels of Settings screens.
 2012-05-14 19:41:20 -07:00
Eric Fischer
a667ed2605 am 587e9eb4: am 25043553: Fix "boumds" typo. 
* commit '587e9eb41eb98082ee933c501dfb910af2f28f8e':
  Fix "boumds" typo.
 2012-05-14 19:41:20 -07:00
Dianne Hackborn
730e4464b1 am 40b4243b: am e5050b1b: Merge "Implement issue #6477793: Add "restore" button to manage apps" into jb-dev 
* commit '40b4243bd5c7dc34a47c32b0a890060d96686bba':
  Implement issue #6477793: Add "restore" button to manage apps
 2012-05-14 19:41:19 -07:00
Jim Miller
7434a5fbdd Fix 6110711: Fix buttons on ChooseLockPattern for landscape layout 
Change-Id: Ia4086dcc09ae609be85703ba0ea3f1d6ae13b01f
 2012-05-14 19:37:29 -07:00
Amith Yamasani
77f75098cc am 97bbb533: Merge "Fix up-navigation for different levels of Settings screens." into jb-dev 
* commit '97bbb5332414be257678476cf037e396c0b88c17':
  Fix up-navigation for different levels of Settings screens.
 2012-05-14 19:33:32 -07:00
Eric Fischer
587e9eb41e am 25043553: Fix "boumds" typo. 
* commit '250435536042ffad592cbbbd995efa816b76d1ae':
  Fix "boumds" typo.
 2012-05-14 19:33:21 -07:00
Dianne Hackborn
40b4243bd5 am e5050b1b: Merge "Implement issue #6477793: Add "restore" button to manage apps" into jb-dev 
* commit 'e5050b1be72c5552bfc9c734d5a0e89f215bed62':
  Implement issue #6477793: Add "restore" button to manage apps
 2012-05-14 19:32:40 -07:00
Amith Yamasani
904bc3155f Merge "Fix NPE in Display Settings." into jb-dev 2012-05-14 17:53:28 -07:00
Amith Yamasani
980a6c3c4b Fix NPE in Display Settings. 
Handle occasional race in delivering change notifications.

Bug: 6012882
Change-Id: Ic9eff72920ff65a2c8ab85f4af59ba438cd8f99f
 2012-05-14 17:46:23 -07:00
Eric Laurent
106368400d Merge "Implement new volume display policy." into jb-dev 2012-05-14 16:30:41 -07:00
Danielle Millett
1cbd519ebc Merge "Removing the blink checkbox and strings" into jb-dev 2012-05-14 16:24:42 -07:00
Eric Fischer
7978ef631a Merge "Import translations. DO NOT MERGE" into jb-dev 2012-05-14 15:24:25 -07:00
Daisuke Miyakawa
16d91c19dc Modify menu layout for sound setting 
- Move notification setting to "System" section
- Modify strings for category titles
- Change strings' names too to reflect their contents
-- sound_category_calls_and_notification_title
   -> sound_category_call_ringtone_vibrate_title
-- soud_category_feedback_title
   -> sound_category_system_title

Bug: 6036529
Change-Id: I7aaa83571ae3d69212e9debaec4f3b4ec60a281c
 2012-05-14 15:08:19 -07:00
Danielle Millett
70cd7f223d Removing the blink checkbox and strings 
Change-Id: Ifc7b6e185bf47cb7d11c120afd18d2e29c68bc3a
 2012-05-14 17:46:02 -04:00
Eric Fischer
f113bfbe5f Import translations. DO NOT MERGE 
Change-Id: Idfd8e9380f02f2aff3de9138848ebf38513e07d3
 2012-05-14 14:40:58 -07:00
Eric Fischer
ae9f509f50 Import translations. DO NOT MERGE 
Change-Id: Ic2c20ff6f93efac3f30ac08aec1a69d0a49edcc0
 2012-05-14 14:38:36 -07:00
Eric Laurent
9d078e984e Implement new volume display policy. 
Whenever a stream type is muted, the progress bar in volume preference
is at 0.
If a stream is muted by ringer mode and does not control ringer mode,
the progress bar is disabled.

Change-Id: I29a5e459754f989369dc80504c18ce7ca08ed891
 2012-05-14 14:06:23 -07:00
Amith Yamasani
97bbb53324 Merge "Fix up-navigation for different levels of Settings screens." into jb-dev 2012-05-14 11:58:24 -07:00
Amith Yamasani
3d384f4ca2 Fix up-navigation for different levels of Settings screens. 
No up affordance for 2-pane screens since there's already
a fragment breadcrumb for navigating up.

Bug: 6452961

Change-Id: Iad9a5c2d0b68cc8f2aec7d5ed8e2ab14d023d48c
 2012-05-14 11:57:10 -07:00
Eric Fischer
2504355360 Fix "boumds" typo. 
Change-Id: Ideec0c8688c9ee9677039038825b5473aaaed7ba
 2012-05-14 10:40:43 -07:00
Jeff Brown
b09258df5b am 35e59cbe: am cefc41fd: Merge "Update references to PowerManager constants that have moved." into jb-dev 
* commit '35e59cbed9136287920fc22ad793db648635b361':
  Update references to PowerManager constants that have moved.
 2012-05-14 08:37:22 -07:00
Kenny Root
7037deb7cb am a1b0f807: am 72a84b78: Merge "WiFi: only send engine setting when key_id is set" into jb-dev 
* commit 'a1b0f80712b60eb03874c6e7122b4c5e42c90990':
  WiFi: only send engine setting when key_id is set
 2012-05-14 08:35:44 -07:00
Eric Fischer
957296a54f am abe39074: (-s ours) am 411e7724: Merge "Import translations. DO NOT MERGE" into jb-dev 
* commit 'abe390746e3e0f773b6800ad8ec4b561a40cc99a':
  Import translations. DO NOT MERGE
 2012-05-14 08:35:30 -07:00
Amith Yamasani
a89fbe3c60 am 55fd6a2b: am 233aa98b: Merge "Add a tablet-specific string to describe NFC checkbox." into jb-dev 
* commit '55fd6a2b30f208e60c91b377fb30a2cb40debe5b':
  Add a tablet-specific string to describe NFC checkbox.
 2012-05-14 07:47:47 -07:00
Kenny Root
089f241712 am 4591cf88: am 6a665664: Strip off phase2 prefix when setting spinner 
* commit '4591cf88402609162c0c406f0c34a74007bc5076':
  Strip off phase2 prefix when setting spinner
 2012-05-14 07:47:45 -07:00
The Android Automerger
fad2b6ef92 merge in jb-release history after reset to jb-dev 2012-05-14 07:05:22 -07:00
Dianne Hackborn
e5050b1be7 Merge "Implement issue #6477793: Add "restore" button to manage apps" into jb-dev 2012-05-13 15:25:14 -07:00
Dianne Hackborn
14d5714a82 Implement issue #6477793: Add "restore" button to manage apps 
Added!

Change-Id: I1b4ffdd24a1c5878ae3acf3970f9364304eb5250
 2012-05-13 15:19:57 -07:00
Jeff Brown
35e59cbed9 am cefc41fd: Merge "Update references to PowerManager constants that have moved." into jb-dev 
* commit 'cefc41fd9705d3d3c5cbc47d1dd854a618bcf313':
  Update references to PowerManager constants that have moved.
 2012-05-11 19:35:21 -07:00
Jeff Brown
cefc41fd97 Merge "Update references to PowerManager constants that have moved." into jb-dev 2012-05-11 19:33:09 -07:00
Jeff Brown
defcb0060d Update references to PowerManager constants that have moved. 
Bug: 6435382
Change-Id: Ieea857644dc0cf758e0ff4fd595c6a0115457df0
 2012-05-11 18:40:27 -07:00
Kenny Root
a1b0f80712 am 72a84b78: Merge "WiFi: only send engine setting when key_id is set" into jb-dev 
* commit '72a84b78d08d41d6e76767744d03d928e0aa26e1':
  WiFi: only send engine setting when key_id is set
 2012-05-11 15:52:08 -07:00
Kenny Root
72a84b78d0 Merge "WiFi: only send engine setting when key_id is set" into jb-dev 2012-05-11 15:49:31 -07:00
Eric Fischer
abe390746e am 411e7724: Merge "Import translations. DO NOT MERGE" into jb-dev 
* commit '411e7724c67a19d257b19c3a349ac7c3cf0eae3a':
  Import translations. DO NOT MERGE
 2012-05-11 15:38:39 -07:00
Eric Fischer
411e7724c6 Merge "Import translations. DO NOT MERGE" into jb-dev 2012-05-11 15:37:09 -07:00
Eric Fischer
a1681c8b0b Import translations. DO NOT MERGE 
Change-Id: I7c0b23cef5261ac308c5657f3230a320ea7f95ec
 2012-05-11 15:12:42 -07:00