PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
16,578 Commits 1 Branch 0 Tags
ce53ec332cc779c41cfd2db3dee48b68d03f198d
Commit Graph

16578 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Andres Morales
02655776a0 am db9745e4: am 5c9a3b0d: Merge "New black drawables for tap and pay" into lmp-dev 
* commit 'db9745e43a416afb6a52ff89013c2353c812faee':
 2014-09-15 23:55:26 +00:00
Andres Morales
311244539a am d5723235: am 1c09186d: Merge "Fix issue with wifi passwords >16 chars" into lmp-dev 
* commit 'd572323580c0eabb59e9d63f4f3c58f1aa32c71b':
 2014-09-15 23:55:25 +00:00
Baligh Uddin
2a106e2e93 am 19843ad1: (-s ours) am 87c7cec8: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit '19843ad15e5b461ffb061c2c9478054f4cde70da':
 2014-09-15 23:55:24 +00:00
Baligh Uddin
3b2d25707a am 184a7b4f: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 
* commit '184a7b4fd367a3d372efabc9aaf369b6ab8504d1':
  Import translations. DO NOT MERGE
 2014-09-15 23:55:23 +00:00
PauloftheWest
0bc56b9c03 am 357e2826: am 0e73c521: Merge "Material theme updates for Bluetooth Device picker." into lmp-dev 
* commit '357e2826e166821e489607e9ae4006fed19cf57a':
 2014-09-15 23:55:22 +00:00
PauloftheWest
fe0bf29ce5 am 0410a1e3: am 92de681e: Merge "Fix the truncating of Bluetooth icons." into lmp-dev 
* commit '0410a1e327f5276cc600ebda87ee0983f94b3891':
 2014-09-15 23:55:21 +00:00
Fabrice Di Meglio
32434f0b63 am e758df57: am 5a8a75d9: Merge "Fix bug #17358371 Wallpaper attributions in "Legal Information" section of Settings" into lmp-dev 
* commit 'e758df576a099920e00ec360267439b4a719c2ad':
 2014-09-15 23:55:20 +00:00
Chris Wren
d351676e31 am dd95e098: am ee846f88: missing dep. Revert "Implement per-app sensitivity settings toggle." 
* commit 'dd95e098f4e2b8d361df19964ab1ca6701840882':
 2014-09-15 23:55:19 +00:00
Chris Wren
19f50c2e56 am cec40645: am 77fdc93b: Merge "Implement per-app sensitivity settings toggle." into lmp-dev 
* commit 'cec406455239e26056687813dbdefcd9ceafa783':
 2014-09-15 23:55:19 +00:00
Dan Sandler
5d29c6603e am 84176e56: am feec34ce: Merge "Don\'t block notifications from system packages." into lmp-dev 
* commit '84176e5691055d416bc6770704b00f2925a98318':
 2014-09-15 23:55:16 +00:00
PauloftheWest
fed937f07a am 75b8535f: am e1a164bf: Merge "Aligned buttons on the Wi-Fi Assistant Card." into lmp-dev 
* commit '75b8535f7d7329e3b3bf2743987abae850795845':
 2014-09-15 23:55:15 +00:00
Zoltan Szatmary-Ban
d35829bcb3 am 34e537ed: am c91d2cd0: Merge "Put VPN settings under primary profile control" into lmp-dev 
* commit '34e537ed277415530c4a811bfcd9a27a3f17bd00':
 2014-09-15 23:55:14 +00:00
Zoltan Szatmary-Ban
be146343e4 am 4c035b8f: am 1e0ea452: Merge "Start activity for the correct user in Settings > Data Usage" into lmp-dev 
* commit '4c035b8fe4618322d0332b92e6bc4c6e1d8f8cfb':
 2014-09-15 23:55:13 +00:00
Alexandra Gherghina
131d34aecd am c24310c9: am 9dce0791: Merge "Code clean-ups following moving the managed profile under accounts" into lmp-dev 
* commit 'c24310c9638c972f7757b1f2356383730129fac6':
 2014-09-15 23:55:07 +00:00
PauloftheWest
44581c7ffd am b448ea3a: am 7641e1ad: Merge "Fixed an issue were "Saved Networks" would not appear correctly." into lmp-dev 
* commit 'b448ea3a338fa1c7149816d06c11cb0f7431e6bb':
 2014-09-15 23:55:06 +00:00
Fabrice Di Meglio
1695f40e52 am 842feb89: am 52a48226: Merge "Fix bug #17374913 Accessibility settings crashes when there is no accessibility service installed" into lmp-dev 
* commit '842feb896192353083c7d0d0e8be422dc9124a76':
 2014-09-15 23:55:05 +00:00
Fabrice Di Meglio
c1c10754a6 am 9786d300: am 815dc273: Merge "Fix bug #17330962 Clicking a search result in Settings shows \'wireless_settings\' instead of \'More\'" into lmp-dev 
* commit '9786d300a1933d0d5716bc6aa6c9b56b6261bafb':
 2014-09-15 23:55:04 +00:00
Wink Saville
c2c89bf82f am a535fcb5: am 418346d5: Merge "Prepare to make SubscriptionManager public." into lmp-dev 
* commit 'a535fcb5b3a3329d40214f9cf215c49b6b4719ad':
 2014-09-15 23:55:03 +00:00
Fabrice Di Meglio
f6713c2a17 am bcd1ff97: am b5caa647: Merge "Fix bug #17208479 Have Cellular Networks Show up in Data Usage" into lmp-dev 
* commit 'bcd1ff97448f9b9c0dd31f20ab7f3f8108e36b8d':
 2014-09-15 23:55:02 +00:00
Dan Sandler
bb533452be am 2f64d506: am b58b5127: Fix links to notification settings activities. 
* commit '2f64d506e0823a67d9985f25232ef4c17ac14082':
 2014-09-15 23:55:01 +00:00
Vinit Deshpande
b89d110980 am 05725beb: am 963ce475: Merge "Address API Council feedback for WifiAdapter/WPS APIs" into lmp-dev 
* commit '05725beb3565d1eecc3c59995f3c3642d85b5556':
 2014-09-15 23:55:00 +00:00
Amith Yamasani
25661d68fd am 12997ecd: am 99ad06c2: Merge "Change the location mode before applying restrictions" into lmp-dev 
* commit '12997ecd97f0a1c4bbcd187e5009be133af5a790':
 2014-09-15 23:54:59 +00:00
PauloftheWest
4a20069dc0 am 43454701: am ebe496ea: Merge "Fixed a crash when loading Bluetooth Settings." into lmp-dev 
* commit '43454701c670451dc92bf0ac9240366623c37577':
 2014-09-15 23:54:58 +00:00
Jason Monk
710b8857a8 am c8d9504e: am dc4818ab: Merge "Bring back auto-rotate to settings" into lmp-dev 
* commit 'c8d9504eea4f144ec99ad1ee3d5ca5ada2ca7792':
 2014-09-15 23:54:57 +00:00
Paul Lawrence
f88a60f09e am 8826a64a: am 1f06a89f: Merge "Get correct factory reset reason from encryption failure" into lmp-dev 
* commit '8826a64a6cd4a44b55033557e5b4867bcf131e35':
 2014-09-15 23:54:56 +00:00
Maurice Lam
2b193bc952 am 8efe9278: am def48d60: Merge "[WifiSetup] Add shadow below header" into lmp-dev 
* commit '8efe92789ec32f7bf6f890d1196a152902212322':
 2014-09-15 23:54:55 +00:00
PauloftheWest
dbfc2fe1b3 am 9fef5db8: am bde55601: Merge "Fixed a Null Pointer Exception when Wifi Settings is indexing." into lmp-dev 
* commit '9fef5db88e9f67bcf54e5c1668b7475f948fb948':
 2014-09-15 23:54:54 +00:00
Fabrice Di Meglio
72c7d7052c am 8bde623e: am de8c683f: Merge "Fix bug #17250939 Stability: ANRs in Settings: at com.android.settings.search.Index.updateInternal(Index.java:518)" into lmp-dev 
* commit '8bde623e6574467e0417837ce98aee28674d9de2':
 2014-09-15 23:54:53 +00:00
Dan Sandler
2a1249225f am c8c5091f: am 3eac072b: Merge "Switch to vibrate (or slash-bell) icon at ringer volume 0." into lmp-dev 
* commit 'c8c5091f2612f2e74eb678727da7fb1e80210de3':
 2014-09-15 23:54:53 +00:00
PauloftheWest
84acfc617e am a8d4b005: am d6cfeba9: Merge "Updated Wifi Assistant to support RTL." into lmp-dev 
* commit 'a8d4b00508c6cfc975a47d956f2c460ef375c8cc':
 2014-09-15 23:54:52 +00:00
Baligh Uddin
7ddba4418b am 25728d22: (-s ours) am 48d3f0fd: (-s ours) Import translations. DO NOT MERGE 
* commit '25728d220a3fa5cc40d20e436ca72f24a85a365c':
 2014-09-15 23:54:50 +00:00
Baligh Uddin
487e923551 am d7697f0f: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 
* commit 'd7697f0f113536d65a811e8def4a2a2c4eae827a':
  Import translations. DO NOT MERGE
 2014-09-15 23:54:48 +00:00
Wink Saville
ea569f4817 am 98365869: ksd to lmp-sprout-dev 
* commit '983658696be22aa55dc5b37c666cedb8826ded83':
  ksd to lmp-sprout-dev
 2014-09-15 23:54:47 +00:00
PauloftheWest
8ad6c3fe55 Alignment updates for Wi-Fi Settings dialog. 
Bug: 17489021
Change-Id: Id394dbe67625cd33745ccbe0f58921fcc38115ec
 2014-09-15 16:49:31 -07:00
Edward Jee
a539716a94 Do not show phonebook access permission dialog if pairing dialog has already been shown. 
Bug: 16964116, 13886947, 16345619

Change-Id: I9cf2622b49c3812771d57432fed030affaa5ba48
 2014-09-15 14:33:13 -07:00
PauloftheWest
0ca0c8ad20 Merge "Removed all references to "Google Wi-Fi Assistant" from Settings." into lmp-dev 2014-09-15 21:25:13 +00:00
Dianne Hackborn
94aae9afd1 Little more on issue #17495264: tweak when we ignore initial times. 
Change-Id: I7053eb64d7d2281984baef9606334c2df4783cc5
 2014-09-15 14:00:37 -07:00
Dianne Hackborn
ecffbc91b1 Merge "Fix issue #17495264: Battery history graph is bad" into lmp-dev 2014-09-15 20:51:46 +00:00
PauloftheWest
f1fc721929 am 24233660: am 13fbd848: Merge "Updated Wi-Fi Settings icons to new filled-in teal format." into lmp-dev 
* commit '2423366021337a4fff71defdd1c6484df10c0e3b':
  Updated Wi-Fi Settings icons to new filled-in teal format.
 2014-09-15 19:31:20 +00:00
PauloftheWest
2423366021 am 13fbd848: Merge "Updated Wi-Fi Settings icons to new filled-in teal format." into lmp-dev 
* commit '13fbd848d4d39e81bb79231f1d6f63722a7b36f6':
  Updated Wi-Fi Settings icons to new filled-in teal format.
 2014-09-15 19:05:48 +00:00
Maurice Lam
795511ec9c [WifiSetup] Disable app starting window 
Disable the app starting window when start WifiSetupActivity so that
there will not be a blank black screen the first time this activity
is started.

Bug: 17457465
Change-Id: I4fa019a603a088d458fa9bcf126364fbb49b1b1f
 2014-09-15 11:40:34 -07:00
Sander Alewijnse
e625a57a28 Update targetSdkVersion check. 
Bug:16509819
Change-Id: Ibc0afd234eaa13c1862c8e8dd60d68940aa559f5
 2014-09-15 18:55:56 +01:00
PauloftheWest
f4b548c0f5 Removed all references to "Google Wi-Fi Assistant" from Settings. 
+ Removed Wi-Fi Assistant message in Wi-Fi Advanced since it was
overridden by the Wi-Fi Assistant.
+ Removed Wi-Fi Assistant message in Wi-Fi Assistant Card.  Instead,
it is programatically created when the scorer is known.
+ "Google" was replaced with a placeholder.

Bug: 17457236
Change-Id: If3aab06c911ecf6ec13cbf00dea2fe9333abc1fc
 2014-09-15 09:31:56 -07:00
PauloftheWest
13fbd848d4 Merge "Updated Wi-Fi Settings icons to new filled-in teal format." into lmp-dev 2014-09-15 14:35:46 +00:00
Baligh Uddin
9ad0d03486 Import translations. DO NOT MERGE 
Change-Id: I8afcd11572e8785a6ded163f1fb9d267730fa9a1
Auto-generated-cl: translation import
 2014-09-14 23:05:45 -07:00
Dianne Hackborn
2b54a9fa57 Fix issue #17495264: Battery history graph is bad 
Deal better with wall clock time changes in the battery history.

Change-Id: I9d63edafc37bbf663e328a08ba09300be2142594
 2014-09-14 19:17:17 -07:00
Prem Kumar
ea7b2a8d88 am 1097e836: am 2ce54402: am c0deb7da: Merge "Remove UI for Forget AP as a secondary user." into lmp-dev 
* commit '1097e836e4c1e9a32f1349abce0f9afffecde5cd':
  Remove UI for Forget AP as a secondary user.
 2014-09-15 00:30:27 +00:00
Prem Kumar
1097e836e4 am 2ce54402: am c0deb7da: Merge "Remove UI for Forget AP as a secondary user." into lmp-dev 
* commit '2ce5440203684e064102ba3e7ce9bccec4a76610':
  Remove UI for Forget AP as a secondary user.
 2014-09-15 00:15:04 +00:00
Prem Kumar
2ce5440203 am c0deb7da: Merge "Remove UI for Forget AP as a secondary user." into lmp-dev 
* commit 'c0deb7dac00b4fcbc64866042788e3247474538e':
  Remove UI for Forget AP as a secondary user.
 2014-09-15 00:00:25 +00:00
Prem Kumar
c0deb7dac0 Merge "Remove UI for Forget AP as a secondary user." into lmp-dev 2014-09-14 23:51:21 +00:00