PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
29,834 Commits 1 Branch 0 Tags
6cd15aa33d489b31d6f86e5bb208af682b5f99b6
Commit Graph

29834 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Makoto Onuki
ed9aed1878 Merge "Restore "reset ShortcutManager rate limiting" dev option" into nyc-mr1-dev 2016-07-11 17:54:27 +00:00
Maurice Lam
44f2736f54 Fix PIN screen title 
Set the header text of the screen after Activity.setTitle is called,
so that the PIN screen will show the PIN text as header, as opposed to
the default which is always "password".

Bug: 30041779
Change-Id: I525bd4e5c51252410fdeb0424329bbfbd86e5b7d
 2016-07-11 17:48:09 +00:00
Victor Chang
d308bbc358 Merge \"Fix always-on is not turned off when user forgets vpn\" into nyc-mr1-dev 
am: 9505b78e29

Change-Id: I60148caf5e9bd37ae2c0460e6c8a8d6aacf478aa
 2016-07-11 14:08:09 +00:00
Victor Chang
9505b78e29 Merge "Fix always-on is not turned off when user forgets vpn" into nyc-mr1-dev 2016-07-11 13:56:08 +00:00
Julia Reynolds
2c1eb80b1d Correct logic for showing overide dnd field. 
Change-Id: Iae1d053d3816ccdae9f6d9bc6a16622b50e07440
Fixes: 29995563
 2016-07-11 09:10:11 -04:00
Doris Ling
b209123dca Merge \"Add handling for gesture settings for double twist for camera flip.\" into nyc-mr1-dev 
am: 94c8f7ea7e

Change-Id: I28cec18b2f9df53b0a48f7668311e1d4120cb636
 2016-07-09 00:03:11 +00:00
Doris Ling
94c8f7ea7e Merge "Add handling for gesture settings for double twist for camera flip." into nyc-mr1-dev 2016-07-08 23:58:47 +00:00
Doris Ling
96167c75c5 Merge \\"Change gesture settings for Ambient Display from nudge to double tap.\\" into nyc-mr1-dev am: 8ba6e6a792 
am: 67d4b38cc1

Change-Id: I7e7a0833e8cf9dfc5c2727c65a57d29e48d3974c
 2016-07-08 23:42:15 +00:00
Doris Ling
67d4b38cc1 Merge \"Change gesture settings for Ambient Display from nudge to double tap.\" into nyc-mr1-dev 
am: 8ba6e6a792

Change-Id: Ib76c7172feddc578c4f276098e58c050cd4c6f8e
 2016-07-08 23:23:35 +00:00
Doris Ling
8ba6e6a792 Merge "Change gesture settings for Ambient Display from nudge to double tap." into nyc-mr1-dev 2016-07-08 23:16:36 +00:00
Doris Ling
37d247b1af Merge \\"Add summary for Settings->Gestures.\\" into nyc-mr1-dev am: f46dabcf0f 
am: 4dd0373203

Change-Id: Ib0a7afc22ef73bb3cec8f8bb44da73b9487256eb
 2016-07-08 23:11:51 +00:00
Doris Ling
4dd0373203 Merge \"Add summary for Settings->Gestures.\" into nyc-mr1-dev 
am: f46dabcf0f

Change-Id: I1754736fb69495e5601b2e13038e30df1482b792
 2016-07-08 23:03:44 +00:00
Doris Ling
f46dabcf0f Merge "Add summary for Settings->Gestures." into nyc-mr1-dev 2016-07-08 22:56:45 +00:00
Mark Salyzyn
694a4bbcaa Merge \\\\"Settings: add logpersist kernel only selection (strings)\\\\" am: fd021e203d -s ours am: a79d854fb6 am: f8da6eca1c 
am: 9d14c80468

Change-Id: I93977f20bc35487a86fc74ab8c130f921726ede7
 2016-07-08 21:48:55 +00:00
Justin Klaassen
1863ffc982 resolve merge conflicts of 67b3a94 to master 
Change-Id: I8fabdf019fea12793c54745390ed4669118548d0
 2016-07-08 14:40:55 -07:00
Mark Salyzyn
9d14c80468 Merge \\\"Settings: add logpersist kernel only selection (strings)\\\" am: fd021e203d -s ours am: a79d854fb6 
am: f8da6eca1c

Change-Id: Ic56f36df562ded8e353977b1d468732414b9c5eb
 2016-07-08 21:29:15 +00:00
Mark Salyzyn
f8da6eca1c Merge \\"Settings: add logpersist kernel only selection (strings)\\" am: fd021e203d -s ours 
am: a79d854fb6

Change-Id: I06daa419b00c21c3ed981ff674023e3d1d5b1719
 2016-07-08 21:26:51 +00:00
Doris Ling
6607d49202 Change gesture settings for Ambient Display from nudge to double tap. 
Change the description text and animation video to double tap the device
instead of nudge movement. Also update the summary text in
Display->Ambient Display to match the gesture description.

Bug: 30034987
Change-Id: If95e7a417b472dd677174a8187a83594e06e0eee
 2016-07-08 14:24:42 -07:00
Mark Salyzyn
a79d854fb6 Merge \"Settings: add logpersist kernel only selection (strings)\" 
am: fd021e203d  -s ours

Change-Id: I3eebcf646fa289462caf57b51846cee93a7774c0
 2016-07-08 21:24:24 +00:00
Justin Klaassen
67b3a94b81 Merge \"Add Night display settings\" into nyc-mr1-dev 
am: e577ed1b91

Change-Id: I2d3aa5fdd00ccf0fe5dbb55468504b59cc8c8bbb
 2016-07-08 21:15:39 +00:00
Doris Ling
6ae44a03e0 Add summary for Settings->Gestures. 
Add summary text for gesture settings.

Bug: 30034888
Change-Id: I15128b6e533b279ca5da98bf4f0e042dd93a0d02
 2016-07-08 14:14:35 -07:00
Justin Klaassen
e577ed1b91 Merge "Add Night display settings" into nyc-mr1-dev 2016-07-08 21:07:48 +00:00
Mark Salyzyn
fd021e203d Merge "Settings: add logpersist kernel only selection (strings)" 2016-07-08 21:06:29 +00:00
Fan Zhang
34969b0044 UI updates for support tab. am: 48aab452cb 
am: 0e2c45b5df

Change-Id: I5288efecab2f3811cd72fe7be85957865ed4c176
 2016-07-08 19:25:11 +00:00
Fan Zhang
0e2c45b5df UI updates for support tab. 
am: 48aab452cb

Change-Id: I7d2bb55979e6b2a4dfe944552fe9a50a184fe573
 2016-07-08 19:21:26 +00:00
Justin Klaassen
c7cd2982cd Add Night display settings 
Bug: 28615069
Change-Id: I2e8a374a00c06c06d419a6ff46cd3b5d544c1d3e
 2016-07-08 11:48:02 -07:00
Mark Salyzyn
466abc5f0f Settings: add logpersist kernel only selection (strings) 
Bug: 28936216
Bug: 29831823
Change-Id: I4e578bbe2f5bbf936b03fbdac34a225a0432e503
 2016-07-08 11:08:05 -07:00
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