Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
31,710 Commits 1 Branch 0 Tags
dbd039a6de8b08dbbc6a2d05b194967ce23fca1c
Commit Graph

31710 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Doris Ling
6b1a2a8cc8 Add handling for gesture settings for double twist for camera flip. 
Add handling for updating the secure settings for camera double twist
when user updates the on/off toggle, and move
SYSTEM_NAVIGATION_KEYS_ENABLED from Global to Secure.

Bug: 29869445
Change-Id: Iebb937509a661b012688a3eb36efe08d2292ff26
 2016-07-08 10:37:16 -07:00
Fan Zhang
48aab452cb UI updates for support tab. 
Fixes: 29999181
Fixes: 29397123

- Reduce support tile min height to 48dp.
- Add a 8dp spacer between escalation card and first support tile.
- Show different off-hour support escalation title when support hour is
  always avaiable.

Change-Id: I4dacf2b375734c4819b9b19b68fc84faf083c0d4
 2016-07-08 10:26:29 -07:00
Makoto Onuki
0651701930 Restore "reset ShortcutManager rate limiting" dev option 
Bug 30031093

Change-Id: I28cbf56e61937b15eb5806823f40e43d6bac4e72
 2016-07-08 09:37:48 -07:00
Fan Zhang
c74925b5dd Merge \\"Wrap bluetooth edit content in a scrollview.\\" into nyc-mr1-dev am: 96bc7b5d03 
am: 6e5de35ba4

Change-Id: I434ac510f8637285524e579a7bf1ce3a9592bf3f
 2016-07-07 21:10:43 +00:00
Fan Zhang
6e5de35ba4 Merge \"Wrap bluetooth edit content in a scrollview.\" into nyc-mr1-dev 
am: 96bc7b5d03

Change-Id: I70717e53ebdc47a658092743e31dc8db0a70d811
 2016-07-07 21:01:56 +00:00
Fan Zhang
96bc7b5d03 Merge "Wrap bluetooth edit content in a scrollview." into nyc-mr1-dev 2016-07-07 20:30:00 +00:00
Doris Ling
27c6820fb9 Merge \\"Add padding for the animation in the gestures settings.\\" into nyc-mr1-dev am: 1b41dd7f8c 
am: aca1f81bad

Change-Id: I34328c7cebe72358037c0897c1bcefd9788ece46
 2016-07-07 17:14:51 +00:00
Doris Ling
aca1f81bad Merge \"Add padding for the animation in the gestures settings.\" into nyc-mr1-dev 
am: 1b41dd7f8c

Change-Id: I047b71720315408c432b1bd4d430b1724ea48536
 2016-07-07 17:11:12 +00:00
Doris Ling
1b41dd7f8c Merge "Add padding for the animation in the gestures settings." into nyc-mr1-dev 2016-07-07 16:58:40 +00:00
TreeHugger Robot
9298f8c604 Merge "Announce user credential deletions" 2016-07-07 16:54:31 +00:00
Fan Zhang
fb4c548b78 Fix strings for support tab. am: 4178710f3d 
am: caf4498597

Change-Id: Id1269070341ab353e981a640aaadecf9ee58aa34
 2016-07-07 15:40:16 +00:00
Fan Zhang
caf4498597 Fix strings for support tab. 
am: 4178710f3d

Change-Id: Iaf5c0945180fab00986827f03dd1bdf9b4c224eb
 2016-07-07 15:37:23 +00:00
Fan Zhang
4178710f3d Fix strings for support tab. 
Bug: 29105266

- Fix typos in string and comments
- Use 2 different strings for off-hour and off-line cases.

Change-Id: I63859605ff7185d5f8cc66fd31b56f1d09ed11aa
 2016-07-07 08:27:25 -07:00
Fan Zhang
8924756a2b Wrap bluetooth edit content in a scrollview. 
Bug: 28914094

In split screen the dialog content is too tall to fit in viewport. Wrap
content in a scrollview so user can scroll vertically for different
options, and have a visual indication that content is scrollable.

Change-Id: Ia304dca6747cec6f31e86ccf89003ef6890e0640
 2016-07-06 18:18:50 -07:00
Fan Zhang
e2443c0404 Merge \\"Use phone number as summary for \\'About Phone\\'.\\" into nyc-mr1-dev am: 071f62954d 
am: 93acb63447

Change-Id: I527d6e96e8eee878b49cd17f66c493d6b71c6d23
 2016-07-07 00:27:30 +00:00
Fan Zhang
93acb63447 Merge \"Use phone number as summary for \'About Phone\'.\" into nyc-mr1-dev 
am: 071f62954d

Change-Id: I74ff5bbbe078f450769fcfc8f36bddb221daca69
 2016-07-07 00:20:59 +00:00
TreeHugger Robot
071f62954d Merge "Use phone number as summary for 'About Phone'." into nyc-mr1-dev 2016-07-07 00:14:08 +00:00
Fan Zhang
ad2114e99b Use phone number as summary for 'About Phone'. 
Bug: 28419411
Change-Id: I3ac57a770bf4d7416459dadedf91c3d6cefbc6b4
 2016-07-06 15:32:29 -07:00
Doris Ling
2ed8651f1f Merge \\"Fix layout transition from Display->Ambient Display to Gestures\\" into nyc-mr1-dev am: 3633058181 
am: e4b305a0f0

Change-Id: Iff8d7ff83a301a18482c008f912b0a660a314bc0
 2016-07-06 22:29:27 +00:00
Doris Ling
e4b305a0f0 Merge \"Fix layout transition from Display->Ambient Display to Gestures\" into nyc-mr1-dev 
am: 3633058181

Change-Id: I75ed59bcdb3cf2382b8bc6fb9eb99f280fc1df72
 2016-07-06 22:20:07 +00:00
Doris Ling
3633058181 Merge "Fix layout transition from Display->Ambient Display to Gestures" into nyc-mr1-dev 2016-07-06 22:08:08 +00:00
Doris Ling
41d06570a4 Add padding for the animation in the gestures settings. 
Add padding around the animation video in landscape mode to make it look
more proportional.

Bug: 29792743
Change-Id: I52cfcecd680a118741d8ced18afd9fc811a33d94
 2016-07-06 14:59:33 -07:00
Fan Zhang
7b410d1e4b Merge \\"Add logging when click tollfree/tolled phone support button\\" into nyc-mr1-dev am: a0eb2997a9 
am: 5efd8009df

Change-Id: Iae38dc35b951caaf69f6f0cf771b61b06469fea2
 2016-07-06 20:59:52 +00:00
Fan Zhang
75d38e4b43 resolve merge conflicts of 9968f7a to nyc-mr1-dev-plus-aosp 
am: 4a1d2c793d

Change-Id: If3e3020d44c4b69aeaa36e3d58ad73f12a6b01bd
 2016-07-06 20:59:51 +00:00
Fan Zhang
5efd8009df Merge \"Add logging when click tollfree/tolled phone support button\" into nyc-mr1-dev 
am: a0eb2997a9

Change-Id: I7a0d7e8cf410e05e578690b6ece69d6489fb3d81
 2016-07-06 20:56:03 +00:00
TreeHugger Robot
a0eb2997a9 Merge "Add logging when click tollfree/tolled phone support button" into nyc-mr1-dev 2016-07-06 20:44:04 +00:00
Fan Zhang
4a1d2c793d resolve merge conflicts of 9968f7a to nyc-mr1-dev-plus-aosp 
Change-Id: Ic9a3884cc8bd08eea22d7d83660419ac84555e83
 2016-07-06 13:28:19 -07:00
Fan Zhang
121a654084 Merge \\"Remove search in support tab.\\" into nyc-mr1-dev am: bae81b4a6f 
am: afa4fff821

Change-Id: Iaadb88a07abad89a6fe0c0a1ae6cfc058fbd6662
 2016-07-06 20:26:29 +00:00
Doris Ling
9a3cf7725b Fix layout transition from Display->Ambient Display to Gestures 
1. Add handling in Gestures settings to scroll to the corresponding
preference when launching from Display->Ambient Display
2. Remove the bitmap creation for the video preview image
3. Use a custom aspect ration framee layout to hold the animation
instead to avoid resizing of the animation view.

Bug: 29795707
Change-Id: I67209ba2508a93da4fc46ff20986309dbe5a83d5
 2016-07-06 13:21:08 -07:00
Fan Zhang
afa4fff821 Merge \"Remove search in support tab.\" into nyc-mr1-dev 
am: bae81b4a6f

Change-Id: I59e7b9dffd8c488397b6904928e6c56a4ad0664d
 2016-07-06 20:14:46 +00:00
TreeHugger Robot
9968f7a752 Merge "Show 'up arrow' in About phone->Status menu." into nyc-mr1-dev 2016-07-06 20:09:44 +00:00
Fan Zhang
bae81b4a6f Merge "Remove search in support tab." into nyc-mr1-dev 2016-07-06 20:09:10 +00:00
Bill Yi
0dc7e4e116 Import translations. DO NOT MERGE am: 271f042229 -s ours am: d2a702e82f -s ours 
am: b468190a12  -s ours

Change-Id: I02b08be1d509f0ac52a2d9e81373ec6a65065f42
 2016-07-06 18:39:54 +00:00
Bill Yi
b468190a12 Import translations. DO NOT MERGE am: 271f042229 -s ours 
am: d2a702e82f  -s ours

Change-Id: I0f93fc30e59e41f59048b491fd784eb154c3d924
 2016-07-06 18:32:41 +00:00
Bill Yi
d2a702e82f Import translations. DO NOT MERGE 
am: 271f042229  -s ours

Change-Id: Ia494efe0469c9877dc7730c9a57d9be8ea9e30a9
 2016-07-06 18:25:17 +00:00
Maurice Lam
584a11ec4a Update button styles for fingerprint 
Use button styles instead of list style because of UX spec change.

Bug: 29421687
Change-Id: Icf178c881c2325b6183de8667a5657b3d2088f72
 2016-07-06 18:15:06 +00:00
Victor Chang
fcb0d74a3c Fix always-on is not turned off when user forgets vpn 
Change-Id: Iad285ff06abde71ef040cbb29f740bcf20c3bbb7
Fix: 29991174
 2016-07-06 18:27:55 +01:00
Fan Zhang
ece8ff63b6 Remove search in support tab. 
Bug: 29397123
Change-Id: Id2d43724696c04e890adba562b5476e1834779da
 2016-07-06 09:54:07 -07:00
Justin Klaassen
d770c05f6e Ensure classes used via XML are kept by proguard 
Bug: 29795762

- Keep MenuItem onClick methods.
- Keep View subclasses and animatable properties.

Change-Id: I4449c8d6caee1d499d8816e62ffc482661df6bea
 2016-07-06 12:19:10 +00:00
Robin Lee
1c9c4b724f Merge \\"Don\\'t show always-on option connecting PPTP vpn\\" into nyc-mr1-dev am: 1926ed9f83 
am: 2ac7bc0565

Change-Id: I5945bb58dc952bc149a03325013f0904d5157847
 2016-07-06 10:38:22 +00:00
Robin Lee
2ac7bc0565 Merge \"Don\'t show always-on option connecting PPTP vpn\" into nyc-mr1-dev 
am: 1926ed9f83

Change-Id: I98de935857099b26946a66a884908cdcf470e11a
 2016-07-06 10:35:11 +00:00
Robin Lee
1926ed9f83 Merge "Don't show always-on option connecting PPTP vpn" into nyc-mr1-dev 2016-07-06 10:30:13 +00:00
Tony Mak
a63c20b3b6 Merge \\"Show info icon when RestrictedListPreference is disabled\\" into nyc-mr1-dev am: b0a4c897ac 
am: b62a70db93

Change-Id: I033c13b26dec6973f66dc48c491f7a1b15232381
 2016-07-06 09:10:13 +00:00
Tony Mak
b62a70db93 Merge \"Show info icon when RestrictedListPreference is disabled\" into nyc-mr1-dev 
am: b0a4c897ac

Change-Id: Ic9f17f748d414e7c5307d4e81d79a1a55a444091
 2016-07-06 09:07:02 +00:00
Tony Mak
b0a4c897ac Merge "Show info icon when RestrictedListPreference is disabled" into nyc-mr1-dev 2016-07-06 09:01:37 +00:00
Bill Yi
ca2d7746fd Import translations. DO NOT MERGE am: 271f042229 -s ours am: 45215ab25b -s ours 
am: 7f4ded6b14  -s ours

Change-Id: I2cacfd33eb554e4d14c6bd6dfeae55af395dad4a
 2016-07-06 04:42:33 +00:00
Bill Yi
9a4b5e64b8 Import translations. DO NOT MERGE am: a937ff573e -s ours 
am: 370af158e9  -s ours

Change-Id: I1014fde8dcc26b78895cd151ec54f834ca3b7b38
 2016-07-06 04:42:31 +00:00
Bill Yi
7f4ded6b14 Import translations. DO NOT MERGE am: 271f042229 -s ours 
am: 45215ab25b  -s ours

Change-Id: I29d78230052fb90e466fcb8c5e954330e05216a8
 2016-07-06 04:37:00 +00:00
Bill Yi
370af158e9 Import translations. DO NOT MERGE 
am: a937ff573e  -s ours

Change-Id: I714848e4322a4e2ffb6cabc4f99509ab8536c7bd
 2016-07-06 04:36:57 +00:00
Bill Yi
45215ab25b Import translations. DO NOT MERGE 
am: 271f042229  -s ours

Change-Id: I2286ee629008672002f36dcca7f505898a40d1dd
 2016-07-06 04:26:32 +00:00