drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
229,707 Commits 1 Branch 0 Tags
Commit Graph

229707 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Chris Craik
6fb775521a Merge "Log render pipeline in gfxinfo dump" 2016-01-14 18:58:54 +00:00
Fyodor Kupolov
4ae95e5ab9 Merge "Explicitly pass userId to getWindowToken" 2016-01-14 18:37:18 +00:00
Chris Craik
ff3edce12d Log render pipeline in gfxinfo dump 
Change-Id: Ia50c445b29d918f274ec45632d61d8b8479c72eb
 2016-01-14 10:29:38 -08:00
Bartosz Fabianowski
f9bf6da6cd Add WifiConfiguration.shared flag 
am: 6fb0756d2f

* commit '6fb0756d2f59d70507919350f6192718b5d3f630':
  Add WifiConfiguration.shared flag
 2016-01-14 17:24:52 +00:00
Ben Kwa
e2610c4148 Merge "Swap in the correct home icon." 2016-01-14 17:19:36 +00:00
Sudheer Shanka
659133c77b Merge "Made changes to padlock support for preferences." 2016-01-14 16:38:35 +00:00
Sudheer Shanka
ea088af5c1 Made changes to padlock support for preferences. 
- Currently, if a preference is disabled by admin, we add a padlock and disable
the preference. And now if the preference is enabled in some other place, the
padlock is not removed. Updated RestrictedPreference to fix this
behavior.
- Made RestrictedPreferenceHelper and
RestrictedPreferenceHelper.onAttachedToHierarchy public so that preferences in
Settings can use these.
- Put a check for null to avoid NullPointerException.
- Removed a redundant statement.

Change-Id: Ie88a761dc38c58a680c62b3703d2081c67462079
 2016-01-14 16:25:56 +00:00
George Mount
0f5fd2d870 Merge "Add IntDefs for Animator and Transition classes." 2016-01-14 16:21:27 +00:00
Ben Kwa
33a610dea7 Swap in the correct home icon. 
BUG=25793423

Change-Id: I55ef5fbc6d6c1497ef4b761f3af236ba5e7e6bbe
 2016-01-14 08:21:05 -08:00
Bartosz Fabianowski
6fb0756d2f Add WifiConfiguration.shared flag 
* Add boolean WifiConfiguration.shared, which indicates whether a network
  is shared (visible to and usable by all users) or private (visible to
  and usable only by the user who created it)
* Extend WifiConfiguration.configKey(...) so that when two users create
  private configurations for the same network, their configurationKeys
  will be different.
* Make AccessPoint.matches(...) take into account the shared flag

BUG=25600871

Change-Id: I4a4335fa3b4b4f850e16748583a29ab66992ddc8
 2016-01-14 17:18:45 +01:00
Alan Viverette
388eb91c12 Merge "Clean up CalendarView docs and annotations" 2016-01-14 16:17:26 +00:00
Alan Viverette
dbea715a1f Merge "Clean up night mode documentation" 2016-01-14 16:16:30 +00:00
Alan Viverette
4bf96caa84 Merge "Apply menu callbacks to existing Toolbar menu view" 2016-01-14 16:16:00 +00:00
Sudheer Shanka
f8f858e4ea Merge "Add restricted padlocks to tiles in quick settings." 2016-01-14 16:11:12 +00:00
Shreyas Basarge
768464c6c3 Merge "Fix for syncs being dropped when appIdle is on" 2016-01-14 15:54:41 +00:00
Marco Nelissen
61becc4592 Merge "Fix race condition when setting default ringtones" 2016-01-14 15:42:42 +00:00
Robin Lee
b68d2d5b68 Merge "Always-on app VPNs" 2016-01-14 11:37:18 +00:00
Marco Nelissen
68528911b9 Fix race condition when setting default ringtones 
If the device was powered off during first boot, after media scanner
inserted some entries but before the default ringtone settings were
set (or committed to disk), the default settings would not be set
on subsequent boots.

Bug: 18625739
Bug: 22349910
Bug: 25633323
Change-Id: I8ff5d3c4f842297d0675e1f5cbe17c0709a14158
 2016-01-14 00:59:38 -08:00
Justin Harrison
051782fd2d Merge "Fix race condition when setting default ringtones" into mnc-dr1.5-dev am: e41a6c8b19 am: 2363da89a4 
am: 5cb336586e  -s ours

* commit '5cb336586e55e6add5aec1d87ee8848657d9051d':
  Fix race condition when setting default ringtones
 2016-01-14 08:43:45 +00:00
Amit Mahajan
e3e79ff8c9 Merge "Allow turning off Wi-Fi when emergency call is made [DO NOT MERGE]" into mnc-dr1.5-dev am: c6c9b2aa66 am: cd097ff856 
am: 2bb7707e00  -s ours

* commit '2bb7707e00922d2f614b8d92bdf3e62dfa6fd80d':
  Allow turning off Wi-Fi when emergency call is made [DO NOT MERGE]
 2016-01-14 08:09:30 +00:00
Amit Mahajan
77799d5dba Merge "DO NOT MERGE Adding new intent for EMERGENCY_CALL_STATE_CHANGE" into mnc-dr1.5-dev am: 658fdf8426 am: 2b260b0006 
am: fa86813a56  -s ours

* commit 'fa86813a56cf631b4609387e8ef5ed9e82b47eac':
  DO NOT MERGE Adding new intent for EMERGENCY_CALL_STATE_CHANGE
 2016-01-14 08:07:45 +00:00
Daichi Hirono
537427bdda Merge "Add a test for createDocument and getPartialObject." 2016-01-14 07:46:43 +00:00
Justin Harrison
5cb336586e Merge "Fix race condition when setting default ringtones" into mnc-dr1.5-dev am: e41a6c8b19 
am: 2363da89a4

* commit '2363da89a431d8809c49e4bb9568f63887e6e33e':
  Fix race condition when setting default ringtones
 2016-01-14 06:48:37 +00:00
Justin Harrison
2363da89a4 Merge "Fix race condition when setting default ringtones" into mnc-dr1.5-dev 
am: e41a6c8b19

* commit 'e41a6c8b19482a05a98e77d13281f7f14056f119':
  Fix race condition when setting default ringtones
 2016-01-14 06:44:21 +00:00
Justin Harrison
e41a6c8b19 Merge "Fix race condition when setting default ringtones" into mnc-dr1.5-dev 2016-01-14 06:42:20 +00:00
Amit Mahajan
2bb7707e00 Merge "Allow turning off Wi-Fi when emergency call is made [DO NOT MERGE]" into mnc-dr1.5-dev am: c6c9b2aa66 
am: cd097ff856

* commit 'cd097ff856b800e3d6b991adfe2316007ddb9957':
  Allow turning off Wi-Fi when emergency call is made [DO NOT MERGE]
 2016-01-14 06:38:27 +00:00
Amit Mahajan
fa86813a56 Merge "DO NOT MERGE Adding new intent for EMERGENCY_CALL_STATE_CHANGE" into mnc-dr1.5-dev am: 658fdf8426 
am: 2b260b0006

* commit '2b260b0006403e6be39015c12e422f9782ce6877':
  DO NOT MERGE Adding new intent for EMERGENCY_CALL_STATE_CHANGE
 2016-01-14 06:34:46 +00:00
Amit Mahajan
cd097ff856 Merge "Allow turning off Wi-Fi when emergency call is made [DO NOT MERGE]" into mnc-dr1.5-dev 
am: c6c9b2aa66

* commit 'c6c9b2aa66635761b5cebc2faf9e06631c36eab5':
  Allow turning off Wi-Fi when emergency call is made [DO NOT MERGE]
 2016-01-14 06:33:00 +00:00
Amit Mahajan
2b260b0006 Merge "DO NOT MERGE Adding new intent for EMERGENCY_CALL_STATE_CHANGE" into mnc-dr1.5-dev 
am: 658fdf8426

* commit '658fdf8426e5c0fb68b7c04af651eae93a32b4b4':
  DO NOT MERGE Adding new intent for EMERGENCY_CALL_STATE_CHANGE
 2016-01-14 06:30:15 +00:00
Amit Mahajan
c6c9b2aa66 Merge "Allow turning off Wi-Fi when emergency call is made [DO NOT MERGE]" into mnc-dr1.5-dev 2016-01-14 06:28:47 +00:00
Amit Mahajan
658fdf8426 Merge "DO NOT MERGE Adding new intent for EMERGENCY_CALL_STATE_CHANGE" into mnc-dr1.5-dev 2016-01-14 06:26:26 +00:00
Chenjie Luo
5ffb219d80 Merge "Add STEM_1, STEM_2 and STEM_3 key as wakeup keys" into cw-e-dev am: 4a577bff96 am: d5cea64d8d am: 7034a6e2d0 
am: af8c1b8f94

* commit 'af8c1b8f943f2c616c75da83b44063ae3a5f556f':
  Add STEM_1, STEM_2 and STEM_3 key as wakeup keys
 2016-01-14 06:13:43 +00:00
Daichi Hirono
d426ed2785 Add a test for createDocument and getPartialObject. 
BUG=26482337

Change-Id: Ifda5055b422c3960f7c3c5275a1697f96e36bd06
 2016-01-14 14:23:48 +09:00
Daichi Hirono
9297a0fb2a Merge "Check isDestroyed after finishing async HandleRootsChangedTask." 2016-01-14 03:59:12 +00:00
Daichi Hirono
a796746198 Check isDestroyed after finishing async HandleRootsChangedTask. 
HandleRootsChangedTask will be finished after the Activity is destroyed,
though we no longer to be able to change the directory at that time.

BUG=26454277

Change-Id: Ia414134c80d900ef2e6c382fdd9209a154d940af
 2016-01-14 12:45:49 +09:00
Adam Lesinski
44859db74b Merge "AAPT2: Variety of small fixes to get the build working" 2016-01-14 02:51:02 +00:00
Adam Lesinski
52364f7ae3 AAPT2: Variety of small fixes to get the build working 
- Add option to rename package in AndroidManifest.xml
- Support default versionName and versionCode
- Accept True and False as valid booleans

Change-Id: I400e350b9dcd0fd1c197d1929144299c7823617d
 2016-01-13 18:48:24 -08:00
Jiaquan He
e7d716d5e3 Add support for shortcuts with the shift key. 
Now shortcuts with the shift key can be defined in
frameworks/base/packages/SettingsProvider/res/xml/bookmarks.xml.

Sample:

<bookmark
    package="package"
    class="package.Class"
    shift="true"
    shortcut="z"  />

Bug 26540880

Change-Id: Ib6d6ea59124226d4e4eb8ec9972059f2d71bd77e
(cherry picked from commit e7319ecbbe865db8884914ceb10f526f4e160a64)
 2016-01-14 02:36:58 +00:00
Chenjie Luo
af8c1b8f94 Merge "Add STEM_1, STEM_2 and STEM_3 key as wakeup keys" into cw-e-dev am: 4a577bff96 am: d5cea64d8d 
am: 7034a6e2d0

* commit '7034a6e2d05c45c437bef6150bcc70b58b3ccb3b':
  Add STEM_1, STEM_2 and STEM_3 key as wakeup keys
 2016-01-14 02:34:53 +00:00
Chenjie Luo
7034a6e2d0 Merge "Add STEM_1, STEM_2 and STEM_3 key as wakeup keys" into cw-e-dev am: 4a577bff96 
am: d5cea64d8d

* commit 'd5cea64d8d63e9ffb61af1e669962de08ea513cc':
  Add STEM_1, STEM_2 and STEM_3 key as wakeup keys
 2016-01-14 02:29:13 +00:00
Daichi Hirono
cc1251b9b2 Merge "Change offset and size arguments of MtpDevice#getPartialObject to Java long." 2016-01-14 02:28:45 +00:00
Vinit Deshpande
1bbc082a47 Allow turning off Wi-Fi when emergency call is made [DO NOT MERGE] 
Bug: 24147407

Change-Id: Ia07b8bc4ccbdaeea18ed22fbfcf813f71ddfa7dc
 2016-01-13 18:27:16 -08:00
Chenjie Luo
d5cea64d8d Merge "Add STEM_1, STEM_2 and STEM_3 key as wakeup keys" into cw-e-dev 
am: 4a577bff96

* commit '4a577bff9674f4bc748ab76bf48ac6e7d3e567cc':
  Add STEM_1, STEM_2 and STEM_3 key as wakeup keys
 2016-01-14 02:24:48 +00:00
Chenjie Luo
4a577bff96 Merge "Add STEM_1, STEM_2 and STEM_3 key as wakeup keys" into cw-e-dev 2016-01-14 02:22:15 +00:00
Dongwon Kang
1ef6a06e11 Merge "Fix javadoc related to ACTION_MEDIA_RESOURCE_GRANTED" 2016-01-14 02:16:23 +00:00
Dongwon Kang
32cb9ab5cc Fix javadoc related to ACTION_MEDIA_RESOURCE_GRANTED 
This addresses comments left in If506a533c5c7b567e770217a9430bf68b539677a

Change-Id: I6f952db6a8fa246d974bab556be3e21fe1b7f3da
 2016-01-13 18:11:10 -08:00
Amit Mahajan
7e8b8f1734 DO NOT MERGE Adding new intent for EMERGENCY_CALL_STATE_CHANGE 
Bug: 24147407
Change-Id: Ida957b9cc6b9c3e13bc8660213ce5cf979c886d5
 2016-01-14 01:59:55 +00:00
Doris Liu
2300b83462 Merge "Properly handle the negative scaling factor of canvas in VectorDrawable" 2016-01-14 01:30:02 +00:00
Chenjie Luo
bad498f7fd Add STEM_1, STEM_2 and STEM_3 key as wakeup keys 
Bug: 25860409
Change-Id: I3f525c9c8df81807d98391c70cd2d1f8c139c8f5
 2016-01-14 01:26:05 +00:00
Doris Liu
e410a357f5 Properly handle the negative scaling factor of canvas in VectorDrawable 
Bug: 26489687
Change-Id: I91cce34759fbbac206cd59f4636fd92194396c87
 2016-01-13 17:23:33 -08:00