Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
204,541 Commits 3 Branches 0 Tags
01fda52778ef3b2a8a3d7ea76e65fea2705ab3e5
Commit Graph

50207 Commits

Author SHA1 Message Date
Dianne Hackborn
01fda52778 am ed3b4253: am 5cdc7f04: am 3aefa438: am 78ead58d: Merge "Fix issue #22531747: Assist info should declare if user has disabled..." into mnc-dev 
* commit 'ed3b42539a4d883533177d008c7ffb2a58e50af6':
  Fix issue #22531747: Assist info should declare if user has disabled...
 2015-07-20 20:42:32 +00:00
Ricardo Garcia
3f655b83d3 am c42940c9: am f2fd5002: am 238f03c9: am 2dcfc7a9: Merge "Fix for MidiManager bug" into mnc-dev 
* commit 'c42940c96a4419528310f6dfc23444de385b4cb2':
  Fix for MidiManager bug
 2015-07-20 20:42:12 +00:00
Dianne Hackborn
5cdc7f045f am 3aefa438: am 78ead58d: Merge "Fix issue #22531747: Assist info should declare if user has disabled..." into mnc-dev 
* commit '3aefa438300b116d2c080de434e0a890bf1dded5':
  Fix issue #22531747: Assist info should declare if user has disabled...
 2015-07-20 20:12:48 +00:00
Dianne Hackborn
3aefa43830 am 78ead58d: Merge "Fix issue #22531747: Assist info should declare if user has disabled..." into mnc-dev 
* commit '78ead58df03e476d656c7e875fff9ade13b727c1':
  Fix issue #22531747: Assist info should declare if user has disabled...
 2015-07-20 20:02:32 +00:00
Dianne Hackborn
78ead58df0 Merge "Fix issue #22531747: Assist info should declare if user has disabled..." into mnc-dev 2015-07-20 19:50:50 +00:00
Dianne Hackborn
17f693520d Fix issue #22531747: Assist info should declare if user has disabled... 
...context and/or screenshot

Added new API to find out what contextual data has been globally disabled.

Also updated various documentation to make it clear what kind of contextual
data you will get (and when it will be null).

Also added a new Activity.showAssist() API because...  well, I was already
in there, it was easy to do, it is safe, and maybe people will build cool
things with it.

Change-Id: Ia553d6bcdd098dc0fce4b9237fbfaca9652fc74b
 2015-07-20 12:49:10 -07:00
Billy Lau
1ab5d39764 am 68a2b655: am e4bcf480: am dd0602e8: am 072e04a7: Merge "Bug: 22598083 Document how apps can detect WRITE_SETTINGS or SYSTEM_ALERT_WINDOW through AppOps" into mnc-dev 
* commit '68a2b6552af226cbc014273bdef6ce353ebf348a':
  Bug: 22598083 Document how apps can detect WRITE_SETTINGS or SYSTEM_ALERT_WINDOW through AppOps
 2015-07-20 19:26:13 +00:00
Ricardo Garcia
f2fd500262 am 238f03c9: am 2dcfc7a9: Merge "Fix for MidiManager bug" into mnc-dev 
* commit '238f03c9b38182c2e4347ece097b4cb18ba926ab':
  Fix for MidiManager bug
 2015-07-20 19:11:07 +00:00
Ricardo Garcia
238f03c9b3 am 2dcfc7a9: Merge "Fix for MidiManager bug" into mnc-dev 
* commit '2dcfc7a9972de3abfebdf2d84bcba0095e4fbae5':
  Fix for MidiManager bug
 2015-07-20 18:47:21 +00:00
Billy Lau
e4bcf4803b am dd0602e8: am 072e04a7: Merge "Bug: 22598083 Document how apps can detect WRITE_SETTINGS or SYSTEM_ALERT_WINDOW through AppOps" into mnc-dev 
* commit 'dd0602e89daf6c458674efbcf01a5e0521f3c381':
  Bug: 22598083 Document how apps can detect WRITE_SETTINGS or SYSTEM_ALERT_WINDOW through AppOps
 2015-07-20 18:43:56 +00:00
Billy Lau
dd0602e89d am 072e04a7: Merge "Bug: 22598083 Document how apps can detect WRITE_SETTINGS or SYSTEM_ALERT_WINDOW through AppOps" into mnc-dev 
* commit '072e04a7f1a167dc653b5bcca4876fecfdb4f6be':
  Bug: 22598083 Document how apps can detect WRITE_SETTINGS or SYSTEM_ALERT_WINDOW through AppOps
 2015-07-20 18:04:08 +00:00
Ricardo Garcia
2dcfc7a997 Merge "Fix for MidiManager bug" into mnc-dev 2015-07-20 18:03:45 +00:00
Billy Lau
072e04a7f1 Merge "Bug: 22598083 Document how apps can detect WRITE_SETTINGS or SYSTEM_ALERT_WINDOW through AppOps" into mnc-dev 2015-07-20 17:57:30 +00:00
Billy Lau
24b9c8314b Bug: 22598083 Document how apps can detect WRITE_SETTINGS or SYSTEM_ALERT_WINDOW 
through AppOps

Expose OP_STR strings that describes the ops for WRITE_SETTINGS and
SYSTEM_ALERT_WINDOW permissions such that apps can query AppOpsManager
whether this capability is turned on or off by the user.

Change-Id: I0e7a6f39e02389290232e450624b40ffb255abfb
 2015-07-20 18:36:39 +01:00
Erik Kline
56066f6036 am f35e9344: am ec69003d: am 9d598e11: Pass signal strength thresholds inside a Bundle 
* commit 'f35e93446d5172446fa2cf37cac405a62cd54233':
  Pass signal strength thresholds inside a Bundle
 2015-07-18 18:08:45 +00:00
Lorenzo Colitti
a169460950 am 1c6b02af: am da355c80: am c3f21f3b: Support NetworkCallbacks based on signal strength. 
* commit '1c6b02af8b53982c2717c684e5cdd94618dff422':
  Support NetworkCallbacks based on signal strength.
 2015-07-18 18:08:39 +00:00
Lorenzo Colitti
15cda089b6 am 6163290e: am e647d93d: am 8bf977d5: ConnectivityManager API for for packet keepalives. 
* commit '6163290e5975b0d4ebdecc20dfa41faac4b4ba79':
  ConnectivityManager API for for packet keepalives.
 2015-07-18 17:51:42 +00:00
Lorenzo Colitti
2d2a59924d am 47a47d3b: am 00365fc6: am 260a36d1: Make immutable NetworkCapabilities more explicit. 
* commit '47a47d3b907325be3b851ce87f275e6032527c5e':
  Make immutable NetworkCapabilities more explicit.
 2015-07-18 17:51:36 +00:00
Erik Kline
ec69003d9b am 9d598e11: Pass signal strength thresholds inside a Bundle 
* commit '9d598e115f306e4f0860638c5647a959ac1320c5':
  Pass signal strength thresholds inside a Bundle
 2015-07-18 17:41:11 +00:00
Lorenzo Colitti
da355c80b0 am c3f21f3b: Support NetworkCallbacks based on signal strength. 
* commit 'c3f21f3b8b01508f5dc01b2e5fa4c3d652bb67bb':
  Support NetworkCallbacks based on signal strength.
 2015-07-18 17:41:07 +00:00
Erik Kline
9d598e115f Pass signal strength thresholds inside a Bundle 
Bug: 21407651
Change-Id: I2c80e89441e2eb15a246cb1fa9347f886cefa80f
 2015-07-18 17:28:52 +00:00
Lorenzo Colitti
c3f21f3b8b Support NetworkCallbacks based on signal strength. 
Bug: 21405941
Change-Id: I2ed8a5aeb8dac464a4305671ed22abcacb485bc9
 2015-07-18 17:28:26 +00:00
Lorenzo Colitti
e647d93d6d am 8bf977d5: ConnectivityManager API for for packet keepalives. 
* commit '8bf977d562b8f7261cf964bdf045b22bdbd92b7d':
  ConnectivityManager API for for packet keepalives.
 2015-07-18 17:24:05 +00:00
Lorenzo Colitti
00365fc62e am 260a36d1: Make immutable NetworkCapabilities more explicit. 
* commit '260a36d1b20469d39490b61fca610271bfa53df2':
  Make immutable NetworkCapabilities more explicit.
 2015-07-18 17:24:01 +00:00
Lorenzo Colitti
8bf977d562 ConnectivityManager API for for packet keepalives. 
Bug: 21405946
Change-Id: Ie1f8f8bee684fe2bb1092a9f1bc9f5dc29b1defc
 2015-07-18 17:00:13 +00:00
Lorenzo Colitti
260a36d1b2 Make immutable NetworkCapabilities more explicit. 
Bug: 21405941
Change-Id: Iafd738c31747b0f5f9356bed1c97f5f282830af1
 2015-07-18 16:59:47 +00:00
Chet Haase
486fdeca12 am 00adea5f: am 3e75ef10: am fcba54eb: am d3f327be: Merge "Localize SimpleMonthView" into mnc-dev 
* commit '00adea5f6456a207a806fc20a5123821520c1e45':
  Localize SimpleMonthView
 2015-07-18 00:11:29 +00:00
Chet Haase
3e75ef102e am fcba54eb: am d3f327be: Merge "Localize SimpleMonthView" into mnc-dev 
* commit 'fcba54eb88e8f4ef867d2205485e391d9855ef4a':
  Localize SimpleMonthView
 2015-07-17 23:41:11 +00:00
Chet Haase
fcba54eb88 am d3f327be: Merge "Localize SimpleMonthView" into mnc-dev 
* commit 'd3f327be2d1f8facd709895f2d05757351e8be07':
  Localize SimpleMonthView
 2015-07-17 23:31:44 +00:00
Chet Haase
d3f327be2d Merge "Localize SimpleMonthView" into mnc-dev 2015-07-17 23:28:15 +00:00
Chet Haase
1ea4715cec Localize SimpleMonthView 
The days of the month were not being localized, resulting in
English numbers for non-English languages. Now we format the numbers
with the current locale.

Issue #22540629  [MRA14D][Arab][Token] numbers displayed in english

Change-Id: I2b17d55ba2d0aa47b5a28c8846c6cf9723ababb1
 2015-07-17 14:26:17 -07:00
Tingting Wang
435d6efc45 am cee00433: am b1322a2a: am 6aee4761: am ad359f2e: Merge "Revert "Don\'t display Custom for PHONE_TYPE=CUSTOM part 1."" into mnc-dev 
* commit 'cee004330e0e7f928437a7b17e6263a1b12bfa8f':
  Revert "Don't display Custom for PHONE_TYPE=CUSTOM part 1."
 2015-07-17 19:23:23 +00:00
Tingting Wang
b1322a2a11 am 6aee4761: am ad359f2e: Merge "Revert "Don\'t display Custom for PHONE_TYPE=CUSTOM part 1."" into mnc-dev 
* commit '6aee4761a826c3ef2793dc5c62d2451bd7450c61':
  Revert "Don't display Custom for PHONE_TYPE=CUSTOM part 1."
 2015-07-17 18:45:41 +00:00
Tingting Wang
6aee4761a8 am ad359f2e: Merge "Revert "Don\'t display Custom for PHONE_TYPE=CUSTOM part 1."" into mnc-dev 
* commit 'ad359f2e705280e26198890a95d53e3566126bcc':
  Revert "Don't display Custom for PHONE_TYPE=CUSTOM part 1."
 2015-07-17 18:30:56 +00:00
Tingting Wang
ad359f2e70 Merge "Revert "Don't display Custom for PHONE_TYPE=CUSTOM part 1."" into mnc-dev 2015-07-17 18:19:56 +00:00
Chien-Yu Chen
a66ff7736f am 39b3013d: am fe13f57f: am 98977fa0: am aa9a27bb: Merge "Camera2: Update FAST mode for EE and NR" into mnc-dev 
* commit '39b3013dfed727ed9273b377d5998a442d931fac':
  Camera2: Update FAST mode for EE and NR
 2015-07-17 17:47:48 +00:00
Eino-Ville Talvala
5c24b98ca2 am 02d3199d: am 5e20e0c9: am 69508f49: am 6e8a551f: Merge "Camera2: Add hidden experimental tearDown method" into mnc-dev 
* commit '02d3199dbe9d1d59e2ef288e5e170248e1d52bd4':
  Camera2: Add hidden experimental tearDown method
 2015-07-17 17:47:42 +00:00
Nancy Chen
7688014d4f am a48413e2: am f9b4961d: am ce9fea39: am 660322d8: Merge "Add transcription field to voicemail object and related changes." into mnc-dev 
* commit 'a48413e28b92e10a96af98e600c56124cd491365':
  Add transcription field to voicemail object and related changes.
 2015-07-17 17:33:20 +00:00
Chien-Yu Chen
fe13f57f95 am 98977fa0: am aa9a27bb: Merge "Camera2: Update FAST mode for EE and NR" into mnc-dev 
* commit '98977fa042deb2109d7869f6217447d0c4387e08':
  Camera2: Update FAST mode for EE and NR
 2015-07-17 17:20:09 +00:00
Eino-Ville Talvala
5e20e0c902 am 69508f49: am 6e8a551f: Merge "Camera2: Add hidden experimental tearDown method" into mnc-dev 
* commit '69508f494e46d9055cb424d480bb48d433ad3462':
  Camera2: Add hidden experimental tearDown method
 2015-07-17 17:20:05 +00:00
Chien-Yu Chen
98977fa042 am aa9a27bb: Merge "Camera2: Update FAST mode for EE and NR" into mnc-dev 
* commit 'aa9a27bb9bbfb4bccf999a0d453f4f4d853aac36':
  Camera2: Update FAST mode for EE and NR
 2015-07-17 17:06:02 +00:00
Eino-Ville Talvala
69508f494e am 6e8a551f: Merge "Camera2: Add hidden experimental tearDown method" into mnc-dev 
* commit '6e8a551f9f7691e3d7ada46eeae5d2cc612d7938':
  Camera2: Add hidden experimental tearDown method
 2015-07-17 17:05:54 +00:00
Nancy Chen
f9b4961da0 am ce9fea39: am 660322d8: Merge "Add transcription field to voicemail object and related changes." into mnc-dev 
* commit 'ce9fea390c86f4e7725d2f7486cf97d56fdda5df':
  Add transcription field to voicemail object and related changes.
 2015-07-17 17:05:36 +00:00
Chien-Yu Chen
aa9a27bb9b Merge "Camera2: Update FAST mode for EE and NR" into mnc-dev 2015-07-17 17:01:30 +00:00
Eino-Ville Talvala
6e8a551f9f Merge "Camera2: Add hidden experimental tearDown method" into mnc-dev 2015-07-17 16:54:09 +00:00
Nancy Chen
ce9fea390c am 660322d8: Merge "Add transcription field to voicemail object and related changes." into mnc-dev 
* commit '660322d8259cb256745f15219af0b9004063ea8d':
  Add transcription field to voicemail object and related changes.
 2015-07-17 16:50:52 +00:00
Nancy Chen
660322d825 Merge "Add transcription field to voicemail object and related changes." into mnc-dev 2015-07-17 16:37:43 +00:00
Neil Fuller
1913dc11b1 resolved conflicts for merge of 71165ea6 to mnc-dr-dev-plus-aosp 
Change-Id: I21f2f14186965bdfc66ed3a2e6957d613837e138
 2015-07-17 11:42:55 +01:00
Neil Fuller
7ce3847d75 Merge "Migrate Resources.java to use ICU4j drectly." 2015-07-17 10:09:25 +00:00
Selim Cinek
56c4cef8dc am 3967be02: am b59d3820: am 928b2bf7: am b43b06d1: Merge "Fixed a bug where notifications were not posted on secondary users" into mnc-dev 
* commit '3967be028d4009167b323491de12f8fff890054c':
  Fixed a bug where notifications were not posted on secondary users
 2015-07-17 02:24:41 +00:00